Improve build and documentation

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

diff --git a/pom.xml b/pom.xml
index 27b8bfaea2b2fadb9686797310b975c175308784..41566da45ccd3e40390700e5446344f8608df7a0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,43 +1,38 @@
 <?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>
-               <artifactId>parent</artifactId>
-               <version>1.2.0</version>
-       </parent>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>0.4.0</version>
+       <version>1.1.8-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>
        <properties>
-               <developmentCycle>0.4</developmentCycle>
-               <developmentCycle.startDate>2012-06-19</developmentCycle.startDate>
-               <version.argeo-distribution>1.2.0</version.argeo-distribution>
-               <version.argeo-commons>0.4.0</version.argeo-commons>
-               <!-- distribution -->
-               <site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
-               <site.urlBase>http://projects.argeo.org/commons/site</site.urlBase>
+               <developmentCycle.argeo-commons>1.1</developmentCycle.argeo-commons>
+               <developmentCycle.argeo-commons.startDate>2012-06-19</developmentCycle.argeo-commons.startDate>
+               <version.argeo-distribution>1.3.1</version.argeo-distribution>
+               <version.argeo-commons>1.1.8-SNAPSHOT</version.argeo-commons>
+               <!-- RPM -->
                <rpm.release>6</rpm.release>
                <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/6/x86_64</rpm.stagingRepository>
                <!-- encoding, see http://is.gd/mvn_source_encoding -->
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        </properties>
        <modules>
-               <module>basic</module>
-               <module>osgi</module>
+               <module>base</module>
                <module>server</module>
-               <module>eclipse</module>
                <module>security</module>
        </modules>
-       <url>${site.urlBase}/${developmentCycle}</url>
+       <organization>
+               <name>Argeo</name>
+               <url>http://www.argeo.org</url>
+       </organization>
+       <url>http://projects.argeo.org/commons/</url>
        <scm>
-               <connection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-0.4.0</connection>
-               <developerConnection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-0.4.0
-               </developerConnection>
-               <url>https://svn.argeo.org/commons/tags/argeo-commons-0.4.0</url>
+               <connection>scm:svn:https://svn.argeo.org/commons/trunk</connection>
+               <developerConnection>scm:svn:https://svn.argeo.org/commons/trunk</developerConnection>
+               <url>https://svn.argeo.org/commons/trunk</url>
        </scm>
        <inceptionYear>2007</inceptionYear>
        <licenses>
@@ -48,7 +43,7 @@
                        <comments><![CDATA[
 Argeo Commons Enterprise Framework
                           
-Copyright 2011 Mathieu Baudier
+Copyright (C) 2007-2012 Argeo GmbH
 
 Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
 you may not use this file except in compliance with the License.
@@ -65,6 +60,10 @@ limitations under the License.
                        </comments>
                </license>
        </licenses>
+       <issueManagement>
+               <system>Bugzilla</system>
+               <url>https://bugzilla.argeo.org</url>
+       </issueManagement>
        <developers>
                <developer>
                        <id>mbaudier</id>
@@ -124,6 +123,16 @@ limitations under the License.
                                <plugin>
                                        <artifactId>maven-clean-plugin</artifactId>
                                        <version>2.4.1</version>
+                                       <configuration>
+                                               <filesets>
+                                                       <fileset>
+                                                               <directory>META-INF</directory>
+                                                               <includes>
+                                                                       <include>MANIFEST.MF</include>
+                                                               </includes>
+                                                       </fileset>
+                                               </filesets>
+                                       </configuration>
                                </plugin>
                                <plugin>
                                        <artifactId>maven-surefire-plugin</artifactId>
@@ -157,6 +166,10 @@ limitations under the License.
                                                <autoVersionSubmodules>true</autoVersionSubmodules>
                                        </configuration>
                                </plugin>
+                               <plugin>
+                                       <artifactId>maven-javadoc-plugin</artifactId>
+                                       <version>2.8.1</version>
+                               </plugin>
                                <!-- Apache -->
                                <plugin>
                                        <groupId>org.apache.felix</groupId>
@@ -169,6 +182,8 @@ limitations under the License.
                                                        <Bundle-Version>${project.version}-r${timestamp}</Bundle-Version>
                                                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                                                        <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+                                                       <!-- SLC specific instructions -->
+                                                       <SLC-GroupId>${project.groupId}</SLC-GroupId>
                                                </instructions>
                                        </configuration>
                                        <executions>
@@ -199,6 +214,7 @@ limitations under the License.
                                                <packager>mbaudier@argeo.org</packager>
                                                <group>Applications/System</group>
                                                <prefix>/usr</prefix>
+                                               <copyright>2012 Argeo GmbH and others</copyright>
                                        </configuration>
                                </plugin>
                                <plugin>
@@ -210,7 +226,7 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.argeo.maven.plugins</groupId>
                                        <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                       <version>1.0.33</version>
+                                       <version>1.1.2</version>
                                </plugin>
                                <!-- Others -->
                                <plugin>
@@ -218,6 +234,11 @@ limitations under the License.
                                        <artifactId>maven-license-plugin</artifactId>
                                        <version>1.9.0</version>
                                </plugin>
+                               <plugin>
+                                       <groupId>com.agilejava.docbkx</groupId>
+                                       <artifactId>docbkx-maven-plugin</artifactId>
+                                       <version>2.0.14</version>
+                               </plugin>
                                <!-- Site -->
                                <plugin>
                                        <artifactId>maven-site-plugin</artifactId>
@@ -252,6 +273,8 @@ limitations under the License.
                                                                        <excludePackageNames>*.demo.*:*.internal.*</excludePackageNames>
                                                                        <detectLinks>true</detectLinks>
                                                                        <links>
+                                                                               <!-- Java -->
+                                                                               <link>http://docs.oracle.com/javase/6/docs/api</link>
                                                                                <!-- OSGi -->
                                                                                <link>http://www.osgi.org/javadoc/r4v42</link>
                                                                                <!-- Spring -->
@@ -309,7 +332,7 @@ limitations under the License.
                                                                <configuration>
                                                                        <type>date</type>
                                                                        <dates>
-                                                                               <date>${developmentCycle.startDate}</date>
+                                                                               <date>${developmentCycle.argeo-commons.startDate}</date>
                                                                        </dates>
                                                                        <dateFormat>yyyy-MM-dd</dateFormat>
                                                                </configuration>
@@ -319,6 +342,27 @@ limitations under the License.
                                </plugin>
                        </plugins>
                </pluginManagement>
+               <resources>
+                       <resource>
+                               <directory>src/main/resources</directory>
+                       </resource>
+                       <resource>
+                               <directory>.</directory>
+                               <includes>
+                                       <include>plugin.xml</include>
+                                       <include>META-INF/**</include>
+                                       <include>WEB-INF/**</include>
+                                       <include>icons/**</include>
+                                       <include>branding/**</include>
+                                       <include>*.properties</include>
+                                       <include>properties/*.properties</include>
+                                       <include>p2.inf</include>
+                               </includes>
+                               <excludes>
+                                       <exclude>build.properties</exclude>
+                               </excludes>
+                       </resource>
+               </resources>
                <plugins>
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>
@@ -337,6 +381,25 @@ limitations under the License.
                                        <timestampFormat>yyMMdd_HHmm</timestampFormat>
                                </configuration>
                        </plugin>
+                       <plugin>
+                               <artifactId>maven-clean-plugin</artifactId>
+                               <configuration>
+                                       <filesets>
+                                               <fileset>
+                                                       <directory>META-INF</directory>
+                                                       <includes>
+                                                               <include>MANIFEST.MF</include>
+                                                       </includes>
+                                               </fileset>
+                                       </filesets>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-javadoc-plugin</artifactId>
+                               <configuration>
+                                       <skip>true</skip>
+                               </configuration>
+                       </plugin>
                        <plugin>
                                <artifactId>maven-resources-plugin</artifactId>
                                <configuration>
@@ -353,7 +416,8 @@ limitations under the License.
                        <plugin>
                                <artifactId>maven-release-plugin</artifactId>
                                <configuration>
-                                       <releaseProfiles>rpmbuild,rpmbuild-tp,el5</releaseProfiles>
+                                       <goals>deploy</goals>
+                                       <releaseProfiles>rpmbuild,rpmbuild-tp</releaseProfiles>
                                </configuration>
                        </plugin>
                        <plugin>
@@ -378,13 +442,41 @@ limitations under the License.
                                        </mapping>
                                </configuration>
                        </plugin>
+                       <plugin>
+                               <groupId>com.agilejava.docbkx</groupId>
+                               <artifactId>docbkx-maven-plugin</artifactId>
+                               <configuration>
+                                       <sourceDirectory>doc/reference</sourceDirectory>
+                                       <targetDirectory>target/site/reference</targetDirectory>
+                                       <htmlStylesheet>css/style.css</htmlStylesheet>
+                                       <postProcess>
+                                               <copy todir="target/site/reference">
+                                                       <fileset dir="doc/reference">
+                                                               <include name="*/*.css" />
+                                                       </fileset>
+                                                       <fileset dir="doc/reference">
+                                                               <include name="img/**" />
+                                                       </fileset>
+                                               </copy>
+                                       </postProcess>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <goals>
+                                                       <goal>generate-html</goal>
+                                                       <goal>generate-pdf</goal>
+                                               </goals>
+                                               <phase>pre-site</phase>
+                                       </execution>
+                               </executions>
+                       </plugin>
                </plugins>
        </build>
        <dependencyManagement>
                <dependencies>
                        <dependency>
-                               <groupId>org.argeo.dep</groupId>
-                               <artifactId>versions-all</artifactId>
+                               <groupId>org.argeo.tp</groupId>
+                               <artifactId>binaries</artifactId>
                                <version>${version.argeo-distribution}</version>
                                <type>pom</type>
                                <scope>import</scope>
@@ -393,25 +485,45 @@ limitations under the License.
        </dependencyManagement>
        <repositories>
                <repository>
-                       <id>argeo</id>
-                       <url>http://maven.argeo.org/argeo</url>
+                       <id>argeo-tp</id>
+                       <url>http://repo.argeo.org/data/public/java/org.argeo.tp-1.3.1</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
+                               <checksumPolicy>warn</checksumPolicy>
                        </releases>
-                       <snapshots>
-                               <enabled>false</enabled>
-                               <updatePolicy>never</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </snapshots>
                </repository>
        </repositories>
+       <pluginRepositories>
+               <pluginRepository>
+                       <id>central</id>
+                       <url>http://repo1.maven.org/maven2</url>
+                       <releases>
+                               <enabled>true</enabled>
+                               <updatePolicy>daily</updatePolicy>
+                               <checksumPolicy>warn</checksumPolicy>
+                       </releases>
+               </pluginRepository>
+               <pluginRepository>
+                       <id>argeo-maven-plugins</id>
+                       <url>http://repo.argeo.org/data/public/java/org.argeo.maven.plugins-1.1.x</url>
+                       <releases>
+                               <enabled>true</enabled>
+                               <updatePolicy>daily</updatePolicy>
+                               <checksumPolicy>warn</checksumPolicy>
+                       </releases>
+               </pluginRepository>
+       </pluginRepositories>
        <distributionManagement>
+               <repository>
+                       <id>staging</id>
+                       <url>dav:https://repo.argeo.org/data/files/java/org.argeo.commons-${developmentCycle.argeo-commons}.x</url>
+                       <uniqueVersion>false</uniqueVersion>
+               </repository>
                <site>
-                       <id>argeo-commons-site</id>
+                       <id>site</id>
                        <name>Argeo Commons Site</name>
-                       <url>file://${site.repoBase}/${project.version}</url>
+                       <url>dav:https://repo.argeo.org/data/files/docs/org.argeo.commons-${developmentCycle.argeo-commons}.x</url>
                </site>
        </distributionManagement>
        <profiles>
@@ -421,30 +533,21 @@ limitations under the License.
                                <repository>
                                        <id>localrepo</id>
                                        <name>Internal Release Repository</name>
-                                       <url>dav:http://localrepo:7080/org.argeo.jcr.webapp/webdav/node/main/repo
-                                       </url>
+                                       <url>dav:http://localhost:7070/data/files/java/org.argeo.commons-${developmentCycle.argeo-commons}.x</url>
                                </repository>
-                               <snapshotRepository>
-                                       <id>localrepo.snapshots</id>
-                                       <name>Internal Snapshot Repository</name>
-                                       <url>dav:http://localrepo:7080/org.argeo.jcr.webapp/webdav/node/main/repo
-                                       </url>
-                               </snapshotRepository>
+                               <site>
+                                       <id>site</id>
+                                       <name>Argeo Commons Site</name>
+                                       <url>dav:http://localhost:7070/data/files/docs/org.argeo.commons-${developmentCycle.argeo-commons}.x</url>
+                               </site>
                        </distributionManagement>
                </profile>
                <profile>
                        <id>el5</id>
                        <properties>
                                <rpm.release>5</rpm.release>
-                               <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/5/x86_64
-                               </rpm.stagingRepository>
+                               <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/5/x86_64</rpm.stagingRepository>
                        </properties>
                </profile>
-               <profile>
-                       <id>doc</id>
-                       <modules>
-                               <module>doc</module>
-                       </modules>
-               </profile>
        </profiles>
-</project>
\ No newline at end of file
+</project>