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

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

diff --git a/pom.xml b/pom.xml
index 12416b742e347c48cc01bf4846ec77cb5312da14..42aabe60638cdb0d0e6d01be80f493d5385774ff 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,19 +8,32 @@
        </parent>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>0.2.1-SNAPSHOT</version>
+       <version>0.3.3-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
        <properties>
-               <developmentCycle>0.2</developmentCycle>
-               <version.argeo-distribution>1.1.0</version.argeo-distribution>
-               <version.argeo-ria>0.12.4</version.argeo-ria>
-               <version.maven-argeo-osgi>0.1.29</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>
+               <developmentCycle>0.3</developmentCycle>
+               <version.argeo-distribution>1.1.4</version.argeo-distribution>
+               <version.argeo-commons>0.3.2</version.argeo-commons>
+               <version.argeo-ria>0.12.5</version.argeo-ria>
+               <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>gis</module>
+               <module>sandbox</module>
+       </modules>
        <url>${site.urlBase}/${developmentCycle}</url>
        <scm>
                <connection>scm:svn:https://svn.argeo.org/commons/trunk</connection>
@@ -67,20 +79,13 @@ 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>
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-compiler-plugin</artifactId>
+                                       <version>2.3.2</version>
                                        <configuration>
                                                <source>1.5</source>
                                                <target>1.5</target>
@@ -89,6 +94,7 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-source-plugin</artifactId>
+                                       <version>2.1.2</version>
                                        <executions>
                                                <execution>
                                                        <id>attach-sources</id>
@@ -99,6 +105,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>
@@ -106,9 +122,10 @@ limitations under the License.
                                </plugin>
                                <plugin>
                                        <artifactId>maven-jar-plugin</artifactId>
+                                       <version>2.3.1</version>
                                        <configuration>
                                                <archive>
-                                                       <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+                                                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
                                                </archive>
                                        </configuration>
                                </plugin>
@@ -118,10 +135,11 @@ 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>
                                        </configuration>
@@ -141,9 +159,10 @@ limitations under the License.
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>
                                <artifactId>buildnumber-maven-plugin</artifactId>
+                               <version>1.0-beta-4</version>
                                <executions>
                                        <execution>
-                                               <phase>validate</phase>
+                                               <phase>generate-resources</phase>
                                                <goals>
                                                        <goal>create</goal>
                                                </goals>
@@ -152,12 +171,20 @@ limitations under the License.
                                <configuration>
                                        <doCheck>false</doCheck>
                                        <doUpdate>false</doUpdate>
-                                       <useLastCommittedRevision>true</useLastCommittedRevision>
+                                       <format>{0,date,yyyyMMdd_HHmmss}</format>
+                                       <items>
+                                               <item>timestamp</item>
+                                       </items>
+                                       <revisionOnScmFailure>git</revisionOnScmFailure>
+                                       <providerImplementations>
+                                               <git>svn</git>
+                                       </providerImplementations>
                                </configuration>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-resources-plugin</artifactId>
+                               <version>2.4.3</version>
                                <configuration>
                                        <encoding>UTF-8</encoding>
                                </configuration>
@@ -170,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>
@@ -240,6 +268,7 @@ limitations under the License.
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-project-info-reports-plugin</artifactId>
+                               <version>2.3.1</version>
                                <reportSets>
                                        <reportSet>
                                                <reports>
@@ -262,6 +291,7 @@ limitations under the License.
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-javadoc-plugin</artifactId>
+                               <version>2.7</version>
                                <inherited>false</inherited>
                                <configuration>
                                        <aggregate>true</aggregate>
@@ -271,6 +301,7 @@ limitations under the License.
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-jxr-plugin</artifactId>
+                               <version>2.2</version>
                                <configuration>
                                        <aggregate>true</aggregate>
                                </configuration>
@@ -278,6 +309,7 @@ limitations under the License.
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-surefire-report-plugin</artifactId>
+                               <version>2.7.1</version>
                                <inherited>false</inherited>
                                <configuration>
                                        <aggregate>true</aggregate>
@@ -286,6 +318,7 @@ limitations under the License.
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>
                                <artifactId>taglist-maven-plugin</artifactId>
+                               <version>2.4</version>
                                <configuration>
                                        <aggregate>true</aggregate>
                                        <tags>
@@ -298,6 +331,7 @@ limitations under the License.
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-changelog-plugin</artifactId>
+                               <version>2.2</version>
                                <inherited>false</inherited>
                        </plugin>
                        <plugin>