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

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

diff --git a/pom.xml b/pom.xml
index e3ce398b0f28d6e9c3cc8a3553bd66843c5cbda0..93d9394bc25ba8b835230bfd2f3967e824379886 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
                <developmentCycle>0.3</developmentCycle>
                <developmentCycle.startDate>2011-03-24</developmentCycle.startDate>
                <version.argeo-distribution>1.1.7</version.argeo-distribution>
-               <version.argeo-commons>0.3.4-SNAPSHOT</version.argeo-commons>
+               <version.argeo-commons>0.3.4</version.argeo-commons>
                <!-- distribution -->
                <site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
                <site.urlBase>http://projects.argeo.org/commons/site</site.urlBase>
@@ -32,6 +32,7 @@
                <module>eclipse</module>
                <module>security</module>
                <module>demo</module>
+               <module>doc</module>
        </modules>
        <url>${site.urlBase}/${developmentCycle}</url>
        <scm>
@@ -150,6 +151,9 @@ limitations under the License.
                                <plugin>
                                        <artifactId>maven-release-plugin</artifactId>
                                        <version>2.2.2</version>
+                                       <configuration>
+                                               <autoVersionSubmodules>true</autoVersionSubmodules>
+                                       </configuration>
                                </plugin>
                                <!-- Apache -->
                                <plugin>
@@ -308,20 +312,6 @@ limitations under the License.
                                                                        <dateFormat>yyyy-MM-dd</dateFormat>
                                                                </configuration>
                                                        </plugin>
-                                                       <!-- <plugin> -->
-                                                       <!-- <artifactId>maven-pmd-plugin</artifactId> -->
-                                                       <!-- <version>2.7.1</version> -->
-                                                       <!-- <configuration> -->
-                                                       <!-- <linkXref>true</linkXref> -->
-                                                       <!-- <targetJdk>1.6</targetJdk> -->
-                                                       <!-- <aggregate>true</aggregate> -->
-                                                       <!-- <excludes> -->
-                                                       <!-- <exclude>**/springutil/*.java</exclude> -->
-                                                       <!-- <exclude>**/demo/**/*.java</exclude> -->
-                                                       <!-- <exclude>**/internal/**/*.java</exclude> -->
-                                                       <!-- </excludes> -->
-                                                       <!-- </configuration> -->
-                                                       <!-- </plugin> -->
                                                </reportPlugins>
                                        </configuration>
                                </plugin>
@@ -387,9 +377,6 @@ limitations under the License.
                                </configuration>
                        </plugin>
                </plugins>
-               <!-- NOTE: This is just a vision for the future, it's not yet implemented: 
-                       see MNG-2216 -->
-               <!-- <sourceEncoding>UTF-8</sourceEncoding> -->
        </build>
        <dependencyManagement>
                <dependencies>
@@ -422,20 +409,10 @@ limitations under the License.
                <site>
                        <id>argeo-commons-site</id>
                        <name>Argeo Commons Site</name>
-                       <url>file://${site.repoBase}/${developmentCycle}/</url>
+                       <url>file://${site.repoBase}/${project.version}</url>
                </site>
        </distributionManagement>
        <profiles>
-               <profile>
-                       <id>release</id>
-                       <distributionManagement>
-                               <site>
-                                       <id>argeo-commons-site</id>
-                                       <name>Argeo Commons Site</name>
-                                       <url>file://${site.repoBase}/${project.version}</url>
-                               </site>
-                       </distributionManagement>
-               </profile>
                <profile>
                        <id>localrepo</id>
                        <distributionManagement>
@@ -453,13 +430,6 @@ limitations under the License.
                                </snapshotRepository>
                        </distributionManagement>
                </profile>
-               <profile>
-                       <id>full</id>
-                       <modules>
-                               <module>doc</module>
-                               <module>sandbox</module>
-                       </modules>
-               </profile>
                <profile>
                        <id>el5</id>
                        <properties>