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

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

diff --git a/pom.xml b/pom.xml
index 7344fc97a2dd305ef1cf5df76bd1953145f2689f..7ff1fa422eb7835f722fa546adc1f9eaf154ddf4 100644 (file)
--- 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,18 +8,18 @@
        </parent>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>0.2.2-SNAPSHOT</version>
+       <version>0.3.2-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
        <properties>
-               <developmentCycle>0.2</developmentCycle>
-               <version.argeo-distribution>1.1.1-SNAPSHOT</version.argeo-distribution>
-               <version.argeo-commons>0.2.2-SNAPSHOT</version.argeo-commons>
+               <developmentCycle>0.3</developmentCycle>
+               <version.argeo-distribution>1.1.3</version.argeo-distribution>
+               <version.argeo-commons>0.3.1</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-SNAPSHOT</version.maven-argeo-osgi>
-               <version.maven-bundle-plugin>2.0.1</version.maven-bundle-plugin>
-               <version.maven-argeo-qooxdoo>1.1.0</version.maven-argeo-qooxdoo>
+               <version.equinox>3.6.2</version.equinox>
+               <version.maven-argeo-osgi>0.1.31</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>
        </properties>
@@ -73,8 +72,9 @@ limitations under the License.
                <module>basic</module>
                <module>osgi</module>
                <module>server</module>
-               <module>security</module>
                <module>eclipse</module>
+               <module>security</module>
+               <module>gis</module>
                <module>sandbox</module>
        </modules>
        <build>
@@ -103,6 +103,16 @@ limitations under the License.
                                                </execution>
                                        </executions>
                                </plugin>
+                               <plugin>
+                                       <groupId>org.apache.maven.plugins</groupId>
+                                       <artifactId>maven-clean-plugin</artifactId>
+                                       <version>2.4.1</version>
+                               </plugin>
+                               <plugin>
+                                       <groupId>org.apache.maven.plugins</groupId>
+                                       <artifactId>maven-surefire-plugin</artifactId>
+                                       <version>2.7.1</version>
+                               </plugin>
                                <plugin>
                                        <groupId>org.argeo.maven.plugins</groupId>
                                        <artifactId>maven-argeo-osgi-plugin</artifactId>
@@ -113,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>
@@ -123,10 +133,10 @@ 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>${pom.artifactId}</Bundle-SymbolicName>
+                                                       <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                                                        <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
                                                        <_removeheaders>Bnd-LastModified</_removeheaders>
                                                </instructions>
@@ -185,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>