X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=f67dfdf4cf92c89e359a78e73f5299d02190c729;hb=ed7bc12c0c7bc20d032c8486ae6279086111765a;hp=7c1392b0f02330c48edd7b0cbf8d4152679e7262;hpb=19dc6a9c6a722274c99a849d94f346cda9ba5e2e;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 7c1392b0f..f67dfdf4c 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,12 +14,12 @@
 	<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>
+		<version.argeo-distribution>1.1.3-SNAPSHOT</version.argeo-distribution>
+		<version.argeo-commons>0.2.3-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.maven-argeo-osgi>0.1.31-SNAPSHOT</version.maven-argeo-osgi>
+		<version.maven-bundle-plugin>2.2.0</version.maven-bundle-plugin>
 		<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>
@@ -72,8 +73,8 @@ limitations under the License.
 		<module>basic</module>
 		<module>osgi</module>
 		<module>server</module>
-		<module>security</module>
 		<module>eclipse</module>
+		<module>security</module>
 		<module>sandbox</module>
 	</modules>
 	<build>
@@ -122,7 +123,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>
@@ -132,7 +133,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>
@@ -194,6 +195,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>