Post-release

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

diff --git a/pom.xml b/pom.xml
index 44fdf1d2b0379b4c6fda2fb9415bfb6702c81b36..fe6cb5deb6fab32bcbe7f5fc5776372d19ed9a47 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,7 +8,7 @@
        </parent>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>0.3.4-SNAPSHOT</version>
+       <version>0.3.5-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <description>Generic layers integrating free / open source technologies in order to quickly develop custom enterprise systems: security, JCR, user interface, monitoring</description>
        <packaging>pom</packaging>
@@ -17,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.5-SNAPSHOT</version.argeo-commons>
                <!-- distribution -->
                <site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
                <site.urlBase>http://projects.argeo.org/commons/site</site.urlBase>
@@ -33,6 +32,7 @@
                <module>eclipse</module>
                <module>security</module>
                <module>demo</module>
+               <module>doc</module>
        </modules>
        <url>${site.urlBase}/${developmentCycle}</url>
        <scm>
@@ -151,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>
@@ -217,7 +220,6 @@ limitations under the License.
                                <plugin>
                                        <artifactId>maven-site-plugin</artifactId>
                                        <version>3.0</version>
-                                       <inherited>false</inherited>
                                        <configuration>
                                                <siteDirectory>doc/site</siteDirectory>
                                                <generateSitemap>true</generateSitemap>
@@ -246,6 +248,19 @@ limitations under the License.
                                                                <configuration>
                                                                        <encoding>UTF-8</encoding>
                                                                        <excludePackageNames>*.demo.*:*.internal.*</excludePackageNames>
+                                                                       <detectLinks>true</detectLinks>
+                                                                       <links>
+                                                                               <!-- OSGi -->
+                                                                               <link>http://www.osgi.org/javadoc/r4v42</link>
+                                                                               <!-- Spring -->
+                                                                               <link>http://static.springsource.org/spring/docs/2.5.x/api</link>
+                                                                               <link>http://static.springsource.org/osgi/docs/1.2.x/api</link>
+                                                                               <link>http://static.springsource.org/spring-security/site/docs/2.0.x/apidocs</link>
+                                                                               <!-- JCR -->
+                                                                               <link>http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0</link>
+                                                                               <!-- Eclipse -->
+                                                                               <link>http://help.eclipse.org/helios/topic/org.eclipse.platform.doc.isv/reference/api</link>
+                                                                       </links>
                                                                </configuration>
                                                                <reportSets>
                                                                        <reportSet>
@@ -297,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>
@@ -347,10 +348,35 @@ limitations under the License.
                                        <skip>false</skip>
                                </configuration>
                        </plugin>
+                       <plugin>
+                               <artifactId>maven-release-plugin</artifactId>
+                               <configuration>
+                                       <releaseProfiles>rpmbuild,rpmbuild-tp,el5</releaseProfiles>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>com.mycila.maven-license-plugin</groupId>
+                               <artifactId>maven-license-plugin</artifactId>
+                               <configuration>
+                                       <header>license-apache2-header.txt</header>
+                                       <failIfMissing>true</failIfMissing>
+                                       <aggregate>true</aggregate>
+                                       <includes>
+                                               <include>src/**/*.java</include>
+                                               <include>src/**/*.xml</include>
+                                       </includes>
+                                       <excludes>
+                                               <exclude>**/springutil/**</exclude>
+                                               <exclude>**/qooxdoo-sdk/**</exclude>
+                                       </excludes>
+                                       <useDefaultExcludes>true</useDefaultExcludes>
+                                       <mapping>
+                                               <java>SLASHSTAR_STYLE</java>
+                                               <xml>XML_STYLE</xml>
+                                       </mapping>
+                               </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>
@@ -383,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>
@@ -414,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>