X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=0efa0af55bdb4c539f14a771cdbf53da9c2a7ae5;hb=63906e5a538b4595e1696fee927d647df1dab1b1;hp=4f0f50d3d33a6f1981540ed5850d596ea5c5e00a;hpb=5bad7780ef8a0898a38dbf664d24f31740164923;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 4f0f50d3d..0efa0af55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,21 +8,32 @@
 	</parent>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>0.2.2-SNAPSHOT</version>
+	<version>0.3.4-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
-		<developmentCycle>0.2</developmentCycle>
-		<version.argeo-distribution>1.1.2</version.argeo-distribution>
-		<version.argeo-commons>0.2.2</version.argeo-commons>
+		<developmentCycle>0.3</developmentCycle>
+		<version.argeo-distribution>1.1.5</version.argeo-distribution>
+		<version.argeo-commons>0.3.4-SNAPSHOT</version.argeo-commons>
 		<version.argeo-ria>0.12.5</version.argeo-ria>
-		<version.equinox>3.6.1</version.equinox>
-		<version.maven-argeo-osgi>0.1.30</version.maven-argeo-osgi>
-		<version.maven-bundle-plugin>2.0.1</version.maven-bundle-plugin>
+		<version.equinox>3.6.2</version.equinox>
+		<!-- 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>doc</module>
+		<module>sandbox</module>
+	</modules>
 	<url>${site.urlBase}/${developmentCycle}</url>
 	<scm>
 		<connection>scm:svn:https://svn.argeo.org/commons/trunk</connection>
@@ -69,14 +79,6 @@ limitations under the License.
 			</roles>
 		</developer>
 	</developers>
-	<modules>
-		<module>basic</module>
-		<module>osgi</module>
-		<module>server</module>
-		<module>security</module>
-		<module>eclipse</module>
-		<module>sandbox</module>
-	</modules>
 	<build>
 		<pluginManagement>
 			<plugins>
@@ -123,7 +125,7 @@ limitations under the License.
 					<version>2.3.1</version>
 					<configuration>
 						<archive>
-							<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+							<manifestFile>META-INF/MANIFEST.MF</manifestFile>
 						</archive>
 					</configuration>
 				</plugin>
@@ -133,7 +135,7 @@ limitations under the License.
 					<version>${version.maven-bundle-plugin}</version>
 					<extensions>true</extensions>
 					<configuration>
-						<manifestLocation>target/classes/META-INF</manifestLocation>
+						<manifestLocation>META-INF</manifestLocation>
 						<instructions>
 							<Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
 							<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
@@ -195,6 +197,7 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
+				<version>2.1</version>
 				<configuration>
 					<autoVersionSubmodules>true</autoVersionSubmodules>
 					<releaseProfiles>release</releaseProfiles>