Improve build and documentation

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

diff --git a/pom.xml b/pom.xml
index e472cb84ed9c42e689e7eeeed069a2aa8a6c185b..41566da45ccd3e40390700e5446344f8608df7a0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,18 +4,16 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>1.1.5-SNAPSHOT</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>1.1</developmentCycle>
-               <developmentCycle.startDate>2012-06-19</developmentCycle.startDate>
+               <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,1.2)</version.argeo-commons>
-               <!-- distribution -->
-               <site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
-               <site.urlBase>http://projects.argeo.org/commons/site</site.urlBase>
+               <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 -->
@@ -30,11 +28,10 @@
                <name>Argeo</name>
                <url>http://www.argeo.org</url>
        </organization>
-       <url>${site.urlBase}/${developmentCycle}</url>
+       <url>http://projects.argeo.org/commons/</url>
        <scm>
                <connection>scm:svn:https://svn.argeo.org/commons/trunk</connection>
-               <developerConnection>scm:svn:https://svn.argeo.org/commons/trunk
-               </developerConnection>
+               <developerConnection>scm:svn:https://svn.argeo.org/commons/trunk</developerConnection>
                <url>https://svn.argeo.org/commons/trunk</url>
        </scm>
        <inceptionYear>2007</inceptionYear>
@@ -46,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.
@@ -185,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>
@@ -235,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>
@@ -328,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>
@@ -351,6 +355,7 @@ limitations under the License.
                                        <include>icons/**</include>
                                        <include>branding/**</include>
                                        <include>*.properties</include>
+                                       <include>properties/*.properties</include>
                                        <include>p2.inf</include>
                                </includes>
                                <excludes>
@@ -437,6 +442,34 @@ 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>
@@ -453,7 +486,7 @@ limitations under the License.
        <repositories>
                <repository>
                        <id>argeo-tp</id>
-                       <url>http://repo.argeo.org/org.argeo.jcr.webapp/public/java/org.argeo.tp-1.3.1</url>
+                       <url>http://repo.argeo.org/data/public/java/org.argeo.tp-1.3.1</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
@@ -473,7 +506,7 @@ limitations under the License.
                </pluginRepository>
                <pluginRepository>
                        <id>argeo-maven-plugins</id>
-                       <url>http://repo.argeo.org/org.argeo.jcr.webapp/public/java/org.argeo.maven.plugins-1.1.x</url>
+                       <url>http://repo.argeo.org/data/public/java/org.argeo.maven.plugins-1.1.x</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
@@ -484,13 +517,13 @@ limitations under the License.
        <distributionManagement>
                <repository>
                        <id>staging</id>
-                       <url>dav:https://repo.argeo.org/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x</url>
+                       <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>
@@ -500,13 +533,13 @@ limitations under the License.
                                <repository>
                                        <id>localrepo</id>
                                        <name>Internal Release Repository</name>
-                                       <url>dav:http://localrepo:7070/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x</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:7070/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x</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>
@@ -516,11 +549,5 @@ limitations under the License.
                                <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>