]> git.argeo.org Git - lgpl/argeo-commons.git/blobdiff - pom.xml
Prepare release.
[lgpl/argeo-commons.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index dbd3ed3cff8ab7492887862d662e3d5ebc6d80c5..854638ffe0e677f1c68312a6040748987cce4a10 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,81 +1,63 @@
 <?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"
+<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>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>2.1.12-SNAPSHOT</version>
+       <version>2.1.80-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
+       <!-- <url>http://repo.argeo.org/data/docs/argeo-2.1/site/argeo-commons/</url> -->
        <properties>
-               <version.argeo-commons>2.1.12-SNAPSHOT</version.argeo-commons>
-               <developmentCycle.argeo-commons>2.1</developmentCycle.argeo-commons>
-               <developmentCycle.argeo-commons.startDate>2012-12-19</developmentCycle.argeo-commons.startDate>
-               <version.argeo-distribution>1.4.0</version.argeo-distribution>
-               <version.rap>2.2.0-R-20131204-0942</version.rap>
-               <version.rap.addons>0.5.0.argeo.20141029</version.rap.addons>
+               <version.argeo-commons>2.1.80</version.argeo-commons>
+               <version.argeo-tp>2.1.24</version.argeo-tp>
                <!-- RPM -->
-               <rpm.release>6</rpm.release>
-               <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
-               <!-- encoding, see http://is.gd/mvn_source_encoding -->
+               <argeo.rpm.release>7</argeo.rpm.release>
+               <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
+               <!-- Encoding, see http://is.gd/mvn_source_encoding -->
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <project.scm.id>code.argeo.org</project.scm.id>
        </properties>
        <modules>
                <!-- Base -->
                <module>org.argeo.util</module>
+               <module>org.argeo.enterprise</module>
+               <module>org.argeo.jcr</module>
                <module>org.argeo.osgi.boot</module>
-               <module>org.argeo.server.jcr</module>
+               <module>org.argeo.core</module>
                <!-- Eclipse -->
                <module>org.argeo.eclipse.ui</module>
-               <module>org.argeo.eclipse.ui.jcr</module>
                <module>org.argeo.eclipse.ui.rap</module>
-               <module>org.argeo.eclipse.ui.rcp</module>
-               <!-- Security -->
-               <module>org.argeo.security.core</module>
-               <module>org.argeo.security.jackrabbit</module>
-               <module>org.argeo.security.ldap</module>
-               <module>org.argeo.security.mvc</module>
-               <!-- Security Services -->
-               <module>org.argeo.security.auth.ldap</module>
-               <module>org.argeo.security.dao.ldap</module>
-               <module>org.argeo.security.dao.cli</module>
-               <module>org.argeo.security.dao.os</module>
-               <module>org.argeo.security.dao.jackrabbit</module>
-               <!-- Servers -->
-               <module>org.argeo.server.jcr.mvc</module>
-               <module>org.argeo.server.jackrabbit</module>
-               <module>org.argeo.jackrabbit.webapp</module>
-               <module>org.argeo.server.ads</module>
-               <module>org.argeo.server.ads.server</module>
-               <module>org.argeo.server.rap.webapp</module>
-               <!-- Node -->
-               <module>org.argeo.node.repo.jackrabbit</module>
-               <!-- Standard Workbench Perspectives -->
-               <module>org.argeo.osgi.ui.explorer</module>
-               <module>org.argeo.jcr.ui.explorer</module>
-               <module>org.argeo.security.equinox</module>
-               <module>org.argeo.security.ui</module>
-               <module>org.argeo.security.ui.admin</module>
-               <!-- Standard Workbench Products -->
-               <module>org.argeo.security.ui.rap</module>
-               <module>org.argeo.security.ui.rcp</module>
-               <!-- Legacy -->
-               <module>org.argeo.support.junit</module>
-               <module>org.argeo.server.core</module>
-               <module>org.argeo.ext.jdbm</module>
-               <!-- Dependencies and Distributions -->
+               <!-- CMS -->
+               <module>org.argeo.node.api</module>
+               <module>org.argeo.maintenance</module>
+               <module>org.argeo.cms</module>
+               <module>org.argeo.cms.ui.theme</module>
+               <module>org.argeo.cms.ui</module>
+               <!-- CMS E4 -->
+               <module>org.argeo.cms.e4</module>
+               <module>org.argeo.cms.e4.rap</module>
+               <!-- CMS Workbench -->
+               <module>org.argeo.cms.ui.workbench</module>
+               <module>org.argeo.cms.ui.workbench.rap</module>
+               <!-- Third Parties Extensions -->
+               <module>org.argeo.ext.jackrabbit</module>
+               <module>org.argeo.ext.equinox.jetty</module>
+               <module>org.argeo.ext.rap.ui.workbench</module>
+               <!-- Distribution -->
+               <module>maven</module>
                <module>dep</module>
+               <module>demo</module>
+               <module>doc</module>
                <module>dist</module>
+               <module>rcp</module>
        </modules>
-       <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/trunk</connection>
-               <developerConnection>scm:svn:https://svn.argeo.org/commons/trunk</developerConnection>
-               <url>https://svn.argeo.org/commons/trunk</url>
+               <connection>scm:git:http://git.argeo.org/apache2/argeo-commons.git</connection>
+               <url>http://git.argeo.org/?p=apache2/argeo-commons.git;a=summary</url>
+               <developerConnection>scm:git:https://code.argeo.org/git/apache2/argeo-commons.git</developerConnection>
+               <tag>HEAD</tag>
        </scm>
        <inceptionYear>2007</inceptionYear>
        <licenses>
@@ -86,7 +68,7 @@
                        <comments><![CDATA[
 Argeo Commons Enterprise Framework
                           
-Copyright (C) 2007-2012 Argeo GmbH
+Copyright (C) 2007-2016 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.
@@ -103,45 +85,25 @@ limitations under the License.
                        </comments>
                </license>
        </licenses>
-       <issueManagement>
-               <system>Bugzilla</system>
-               <url>https://bugzilla.argeo.org</url>
-       </issueManagement>
-       <developers>
-               <developer>
-                       <id>mbaudier</id>
-                       <name>Mathieu Baudier</name>
-                       <email><![CDATA[http://mailhide.recaptcha.net/d?k=01EM7GpnvY3k8woQ2tnnZLUA==&c=crsNpHjhOBDPswHG6HD_gXaqymhC69wmBf7wlagcSHw=]]></email>
-                       <organization>Argeo</organization>
-                       <organizationUrl>http://www.argeo.org</organizationUrl>
-                       <roles>
-                               <role>architect</role>
-                               <role>developer</role>
-                               <role>QA</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <id>bsinou</id>
-                       <name>Bruno Sinou</name>
-                       <email><![CDATA[http://www.google.com/recaptcha/mailhide/d?k=01SZoYvDnJzcw0KOR7M7u6Qg==&c=SVgEjXA_Uu9ZrNzLES92w1ght6puLFiVpoNUddCfSU8=]]></email>
-                       <organization>Argeo</organization>
-                       <organizationUrl>http://www.argeo.org</organizationUrl>
-                       <roles>
-                               <role>developer</role>
-                       </roles>
-               </developer>
-       </developers>
        <build>
                <extensions>
                        <extension>
                                <groupId>org.apache.maven.wagon</groupId>
                                <artifactId>wagon-webdav-jackrabbit</artifactId>
-                               <version>2.8</version>
+                               <version>2.10</version>
                        </extension>
                </extensions>
+               <sourceDirectory>src</sourceDirectory>
+               <testSourceDirectory>ext/test</testSourceDirectory>
                <resources>
                        <resource>
-                               <directory>src/main/resources</directory>
+                               <directory>src</directory>
+                               <includes>
+                                       <include>**</include>
+                               </includes>
+                               <excludes>
+                                       <exclude>**/*.java</exclude>
+                               </excludes>
                        </resource>
                        <resource>
                                <directory>.</directory>
@@ -152,45 +114,51 @@ limitations under the License.
                                        <exclude>.*</exclude>
                                        <exclude>.*/**</exclude>
                                        <exclude>src/**</exclude>
+                                       <exclude>ext/**</exclude>
                                        <exclude>target/**</exclude>
                                        <exclude>bin/**</exclude>
                                        <exclude>pom.xml</exclude>
                                        <exclude>build.properties</exclude>
                                        <exclude>*.bnd</exclude>
                                        <exclude>*.target</exclude>
+                                       <exclude>**/*.xcf</exclude>
                                </excludes>
                        </resource>
                </resources>
+               <testResources>
+                       <testResource>
+                               <directory>ext/test</directory>
+                               <includes>
+                                       <include>**</include>
+                               </includes>
+                               <excludes>
+                                       <exclude>**/*.java</exclude>
+                               </excludes>
+                       </testResource>
+               </testResources>
                <pluginManagement>
                        <plugins>
                                <!-- Maven -->
                                <plugin>
                                        <artifactId>maven-compiler-plugin</artifactId>
-                                       <version>3.2</version>
+                                       <version>3.3</version>
                                        <configuration>
-                                               <source>1.6</source>
-                                               <target>1.6</target>
-                                       </configuration>
-                               </plugin>
-                               <plugin>
-                                       <artifactId>maven-source-plugin</artifactId>
-                                       <version>2.4</version>
-                                       <executions>
-                                               <execution>
-                                                       <id>attach-sources</id>
-                                                       <phase>package</phase>
-                                                       <goals>
-                                                               <goal>jar</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions>
-                                       <configuration>
-                                               <excludes>
-                                                       <!-- Prevents source jars to contain misleading data -->
-                                                       <exclude>plugin.xml</exclude>
-                                                       <exclude>META-INF/MANIFEST.MF</exclude>
-                                               </excludes>
+                                               <source>1.8</source>
+                                               <target>1.8</target>
+                                               <compilerId>eclipse</compilerId>
+                                               <!-- Required for compliance level, see http://jira.codehaus.org/browse/PLXCOMP-231 -->
+                                               <optimize>true</optimize>
+                                               <!-- Hack to work around issues with generated annotations : -->
+                                               <generatedSourcesDirectory>target/classes</generatedSourcesDirectory>
+                                               <generatedTestSourcesDirectory>target/test-classes</generatedTestSourcesDirectory>
                                        </configuration>
+                                       <dependencies>
+                                               <dependency>
+                                                       <groupId>org.codehaus.plexus</groupId>
+                                                       <artifactId>plexus-compiler-eclipse</artifactId>
+                                                       <version>2.6</version>
+                                               </dependency>
+                                       </dependencies>
                                </plugin>
                                <plugin>
                                        <artifactId>maven-clean-plugin</artifactId>
@@ -219,9 +187,21 @@ limitations under the License.
                                                </archive>
                                        </configuration>
                                </plugin>
+                               <plugin>
+                                       <artifactId>maven-source-plugin</artifactId>
+                                       <version>3.1.0</version>
+                                       <configuration>
+                                               <excludes>
+                                                       <exclude>**/*.class</exclude>
+                                                       <!-- Prevents source jars to contain misleading data -->
+                                                       <exclude>plugin.xml</exclude>
+                                                       <exclude>META-INF/MANIFEST.MF</exclude>
+                                               </excludes>
+                                       </configuration>
+                               </plugin>
                                <plugin>
                                        <artifactId>maven-antrun-plugin</artifactId>
-                                       <version>1.7</version>
+                                       <version>1.8</version>
                                </plugin>
                                <plugin>
                                        <artifactId>maven-resources-plugin</artifactId>
@@ -231,6 +211,25 @@ limitations under the License.
                                        <artifactId>maven-dependency-plugin</artifactId>
                                        <version>2.9</version>
                                </plugin>
+                               <plugin>
+                                       <artifactId>maven-site-plugin</artifactId>
+                                       <version>3.7</version>
+                               </plugin>
+                               <plugin>
+                                       <artifactId>maven-javadoc-plugin</artifactId>
+                                       <version>3.0.0</version>
+                                       <configuration>
+                                               <failOnError>false</failOnError>
+                                               <additionalJOption>-Xdoclint:none</additionalJOption>
+                                               <excludePackageNames>*.internal.*,org.eclipse.*</excludePackageNames>
+                                               <encoding>UTF-8</encoding>
+                                       </configuration>
+                               </plugin>
+                               <plugin>
+                                       <groupId>pl.project13.maven</groupId>
+                                       <artifactId>git-commit-id-plugin</artifactId>
+                                       <version>3.0.0</version>
+                               </plugin>
                                <plugin>
                                        <artifactId>maven-release-plugin</artifactId>
                                        <version>2.5.1</version>
@@ -238,25 +237,25 @@ limitations under the License.
                                                <autoVersionSubmodules>true</autoVersionSubmodules>
                                        </configuration>
                                </plugin>
-                               <plugin>
-                                       <artifactId>maven-javadoc-plugin</artifactId>
-                                       <version>2.10.1</version>
-                               </plugin>
-                               <!-- Apache -->
                                <plugin>
                                        <groupId>org.apache.felix</groupId>
                                        <artifactId>maven-bundle-plugin</artifactId>
-                                       <version>2.3.7</version>
+                                       <version>3.0.1</version>
                                        <extensions>true</extensions>
                                        <configuration>
                                                <manifestLocation>META-INF</manifestLocation>
                                                <instructions>
-                                                       <Bundle-Version>${project.version}-r${timestamp}</Bundle-Version>
+                                                       <_include>bnd.bnd</_include>
+                                                       <Bundle-Version>${project.version}-r${tstamp}</Bundle-Version>
                                                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                                                       <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
-                                                       <!-- SLC specific instructions -->
-                                                       <SLC-GroupId>${project.groupId}</SLC-GroupId>
+                                                       <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
                                                        <_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
+                                                       <Automatic-Module-Name>${project.artifactId}</Automatic-Module-Name>
+                                                       <SLC-Category>${project.groupId}</SLC-Category>
+                                                       <!-- Git metadata -->
+                                                       <!-- <SLC-Git-Commit-Id>${git.commit.id}</SLC-Git-Commit-Id> -->
+                                                       <!-- <SLC-Git-Commit-Describe>${git.commit.id.describe}</SLC-Git-Commit-Describe> -->
+                                                       <!-- <SLC-Git-Commit-Count>${git.closest.tag.commit.count}</SLC-Git-Commit-Count> -->
                                                </instructions>
                                        </configuration>
                                        <executions>
@@ -270,24 +269,19 @@ limitations under the License.
                                        </executions>
                                </plugin>
                                <!-- Codehaus -->
-                               <plugin>
-                                       <groupId>org.codehaus.mojo</groupId>
-                                       <artifactId>buildnumber-maven-plugin</artifactId>
-                                       <version>1.0</version>
-                               </plugin>
                                <plugin>
                                        <groupId>org.codehaus.mojo</groupId>
                                        <artifactId>rpm-maven-plugin</artifactId>
-                                       <version>2.1</version>
+                                       <version>2.1.4</version>
                                        <extensions>true</extensions>
                                        <configuration>
                                                <version>${project.version}</version>
-                                               <release>r${timestamp}.el${rpm.release}</release>
-                                               <distribution>argeo${rpm.release}</distribution>
-                                               <packager>mbaudier@argeo.org</packager>
+                                               <distribution>argeo${argeo.rpm.release}</distribution>
                                                <group>Applications/System</group>
                                                <prefix>/usr</prefix>
-                                               <copyright>2012 Argeo GmbH and others</copyright>
+                                               <defaultDirMode>755</defaultDirMode>
+                                               <defaultFileMode>644</defaultFileMode>
+                                               <autoRequires>false</autoRequires>
                                        </configuration>
                                </plugin>
                                <plugin>
@@ -298,141 +292,12 @@ limitations under the License.
                                <!-- Argeo -->
                                <plugin>
                                        <groupId>org.argeo.maven.plugins</groupId>
-                                       <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                       <version>1.1.3-SNAPSHOT</version>
-                               </plugin>
-                               <!-- Others -->
-                               <plugin>
-                                       <groupId>com.mycila.maven-license-plugin</groupId>
-                                       <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>
-                                       <version>3.0</version>
-                                       <configuration>
-                                               <siteDirectory>doc/site</siteDirectory>
-                                               <generateSitemap>true</generateSitemap>
-                                               <skip>true</skip>
-                                               <reportPlugins>
-                                                       <plugin>
-                                                               <groupId>org.apache.maven.plugins</groupId>
-                                                               <artifactId>maven-project-info-reports-plugin</artifactId>
-                                                               <version>2.4</version>
-                                                               <reportSets>
-                                                                       <reportSet>
-                                                                               <reports>
-                                                                                       <report>index</report>
-                                                                                       <report>summary</report>
-                                                                                       <report>license</report>
-                                                                                       <report>scm</report>
-                                                                                       <report>issue-tracking</report>
-                                                                                       <report>project-team</report>
-                                                                               </reports>
-                                                                       </reportSet>
-                                                               </reportSets>
-                                                       </plugin>
-                                                       <plugin>
-                                                               <artifactId>maven-javadoc-plugin</artifactId>
-                                                               <version>2.8.1</version>
-                                                               <configuration>
-                                                                       <encoding>UTF-8</encoding>
-                                                                       <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 -->
-                                                                               <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>
-                                                                               <id>aggregate</id>
-                                                                               <reports>
-                                                                                       <report>aggregate</report>
-                                                                               </reports>
-                                                                       </reportSet>
-                                                               </reportSets>
-                                                       </plugin>
-                                                       <plugin>
-                                                               <artifactId>maven-jxr-plugin</artifactId>
-                                                               <version>2.3</version>
-                                                               <configuration>
-                                                                       <excludes>
-                                                                               <exclude>**/demo/**/*</exclude>
-                                                                               <exclude>**/internal/**/*</exclude>
-                                                                       </excludes>
-                                                               </configuration>
-                                                               <reportSets>
-                                                                       <reportSet>
-                                                                               <id>aggregate</id>
-                                                                               <reports>
-                                                                                       <report>aggregate</report>
-                                                                               </reports>
-                                                                       </reportSet>
-                                                               </reportSets>
-                                                       </plugin>
-                                                       <plugin>
-                                                               <groupId>org.codehaus.mojo</groupId>
-                                                               <artifactId>taglist-maven-plugin</artifactId>
-                                                               <version>2.4</version>
-                                                               <configuration>
-                                                                       <aggregate>true</aggregate>
-                                                                       <tags>
-                                                                               <tag>TODO</tag>
-                                                                               <tag>FIXME</tag>
-                                                                       </tags>
-                                                               </configuration>
-                                                       </plugin>
-                                                       <plugin>
-                                                               <artifactId>maven-changelog-plugin</artifactId>
-                                                               <version>2.2</version>
-                                                               <configuration>
-                                                                       <type>date</type>
-                                                                       <dates>
-                                                                               <date>${developmentCycle.argeo-commons.startDate}</date>
-                                                                       </dates>
-                                                                       <dateFormat>yyyy-MM-dd</dateFormat>
-                                                               </configuration>
-                                                       </plugin>
-                                               </reportPlugins>
-                                       </configuration>
+                                       <artifactId>argeo-osgi-plugin</artifactId>
+                                       <version>2.1.1</version>
                                </plugin>
                        </plugins>
                </pluginManagement>
                <plugins>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>buildnumber-maven-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <phase>generate-resources</phase>
-                                               <goals>
-                                                       <goal>create-timestamp</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                               <configuration>
-                                       <doCheck>false</doCheck>
-                                       <doUpdate>false</doUpdate>
-                                       <timestampFormat>yyMMdd_HHmm</timestampFormat>
-                               </configuration>
-                       </plugin>
                        <plugin>
                                <artifactId>maven-clean-plugin</artifactId>
                                <configuration>
@@ -446,12 +311,19 @@ limitations under the License.
                                        </filesets>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <artifactId>maven-javadoc-plugin</artifactId>
-                               <configuration>
-                                       <skip>true</skip>
-                               </configuration>
-                       </plugin>
+                       <!-- <plugin> -->
+                       <!-- <groupId>pl.project13.maven</groupId> -->
+                       <!-- <artifactId>git-commit-id-plugin</artifactId> -->
+                       <!-- <executions> -->
+                       <!-- <execution> -->
+                       <!-- <id>get-the-git-infos</id> -->
+                       <!-- <goals> -->
+                       <!-- <goal>revision</goal> -->
+                       <!-- </goals> -->
+                       <!-- <phase>initialize</phase> -->
+                       <!-- </execution> -->
+                       <!-- </executions> -->
+                       <!-- </plugin> -->
                        <plugin>
                                <artifactId>maven-resources-plugin</artifactId>
                                <configuration>
@@ -465,6 +337,19 @@ limitations under the License.
                                        <skip>false</skip>
                                </configuration>
                        </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-source-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>attach-sources</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>jar</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
                        <plugin>
                                <artifactId>maven-release-plugin</artifactId>
                                <configuration>
@@ -473,85 +358,38 @@ limitations under the License.
                                </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>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
                        </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>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp</artifactId>
+                       <version>${version.argeo-tp}</version>
+                       <scope>provided</scope>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.apache</groupId>
+                                       <artifactId>org.apache.xerces</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+       </dependencies>
        <dependencyManagement>
                <dependencies>
                        <dependency>
                                <groupId>org.argeo.tp</groupId>
-                               <artifactId>binaries</artifactId>
-                               <version>${version.argeo-distribution}</version>
+                               <artifactId>argeo-tp</artifactId>
+                               <version>${version.argeo-tp}</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
-                       <!-- Eclipse RAP -->
                        <dependency>
-                               <groupId>org.argeo.tp.rap</groupId>
-                               <artifactId>binaries</artifactId>
-                               <version>${version.argeo-distribution}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.tp.rap.addons</groupId>
-                               <artifactId>binaries</artifactId>
-                               <version>${version.rap.addons}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.tp.rap.platform</groupId>
-                               <artifactId>binaries</artifactId>
-                               <version>${version.rap}</version>
+                               <groupId>org.argeo.tp</groupId>
+                               <artifactId>argeo-tp-rap-e4</artifactId>
+                               <version>${version.argeo-tp}</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
@@ -559,40 +397,19 @@ limitations under the License.
        </dependencyManagement>
        <repositories>
                <repository>
-                       <id>argeo-tp</id>
-                       <url>http://repo.argeo.org/data/public/java/argeo-tp-1.4</url>
+                       <id>argeo</id>
+                       <url>http://repo.argeo.org/data/java/argeo-2.1/</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
                                <checksumPolicy>warn</checksumPolicy>
                        </releases>
                </repository>
-               <repository>
-                       <id>argeo-tp-rap</id>
-                       <url>http://repo.argeo.org/data/public/java/eclipse-rap-2.2</url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>warn</checksumPolicy>
-                       </releases>
-               </repository>
-               <!--<repository> <id>argeo-tp-rap</id> <url>http://localhost:9070/data/public/java/eclipse-rap-2.2</url> 
-                       <releases> <enabled>true</enabled> <updatePolicy>daily</updatePolicy> <checksumPolicy>warn</checksumPolicy> 
-                       </releases> </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/argeo-maven-1.1</url>
+                       <url>http://repo.argeo.org/data/java/argeo-2.1</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
@@ -600,39 +417,161 @@ limitations under the License.
                        </releases>
                </pluginRepository>
        </pluginRepositories>
+       <reporting>
+               <plugins>
+                       <plugin>
+                               <artifactId>maven-project-info-reports-plugin</artifactId>
+                               <version>2.9</version>
+                               <reportSets>
+                                       <reportSet>
+                                               <reports>
+                                                       <report>index</report>
+                                                       <report>summary</report>
+                                                       <report>license</report>
+                                                       <report>scm</report>
+                                               </reports>
+                                       </reportSet>
+                               </reportSets>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-javadoc-plugin</artifactId>
+                               <version>3.0.0</version>
+                               <configuration>
+                                       <failOnError>false</failOnError>
+                                       <additionalJOption>-Xdoclint:none</additionalJOption>
+                                       <excludePackageNames>*.internal.*,org.eclipse.*</excludePackageNames>
+                                       <encoding>UTF-8</encoding>
+                                       <detectLinks>true</detectLinks>
+                                       <links>
+                                               <link>http://docs.oracle.com/javase/8/docs/api</link>
+                                               <link>https://osgi.org/javadoc/r5/core</link>
+                                               <link>https://osgi.org/javadoc/r5/enterprise</link>
+                                               <link>https://docs.adobe.com/docs/en/spec/javax.jcr/javadocs/jcr-2.0</link>
+                                               <link>http://help.eclipse.org/oxygen/topic/org.eclipse.platform.doc.isv/reference/api</link>
+                                               <link>http://docs.spring.io/spring/docs/3.2.x/javadoc-api</link>
+                                       </links>
+                               </configuration>
+                               <reportSets>
+                                       <reportSet>
+                                               <id>aggregate-javadoc</id>
+                                               <inherited>false</inherited>
+                                               <reports>
+                                                       <report>aggregate</report>
+                                               </reports>
+                                       </reportSet>
+                                       <reportSet>
+                                               <id>javadoc</id>
+                                               <reports />
+                                       </reportSet>
+                               </reportSets>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-jxr-plugin</artifactId>
+                               <version>2.5</version>
+                               <reportSets>
+                                       <reportSet>
+                                               <id>aggregate-jxr</id>
+                                               <inherited>false</inherited>
+                                               <reports>
+                                                       <report>aggregate</report>
+                                               </reports>
+                                       </reportSet>
+                                       <reportSet>
+                                               <id>jxr</id>
+                                               <reports />
+                                       </reportSet>
+                               </reportSets>
+                       </plugin>
+               </plugins>
+       </reporting>
        <distributionManagement>
                <repository>
                        <id>staging</id>
-                       <url>dav:https://repo.argeo.org/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+                       <url>dav:https://forge.argeo.org/data/java/argeo-2.1/</url>
                        <uniqueVersion>false</uniqueVersion>
                </repository>
                <site>
-                       <id>site</id>
-                       <url>dav:https://repo.argeo.org/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}</url>
+                       <id>staging</id>
+                       <url>file:///srv/docfactory/argeo-2.1/site/argeo-commons/</url>
                </site>
        </distributionManagement>
        <profiles>
+               <profile>
+                       <id>rpmbuild</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <artifactId>maven-antrun-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <phase>install</phase>
+                                                               <goals>
+                                                                       <goal>run</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <target>
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+                                                                                       failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
+                                                                                       <flattenmapper />
+                                                                               </copy>
+                                                                       </target>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+               <profile>
+                       <id>rpmbuild-tp</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <artifactId>maven-antrun-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <phase>install</phase>
+                                                               <goals>
+                                                                       <goal>run</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <target>
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+                                                                                       failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
+                                                                                       <flattenmapper />
+                                                                               </copy>
+                                                                       </target>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
                <profile>
                        <id>localrepo</id>
+                       <repositories>
+                               <repository>
+                                       <id>argeo</id>
+                                       <url>http://localhost:7080/data/java/argeo-2.1</url>
+                                       <releases>
+                                               <enabled>true</enabled>
+                                               <updatePolicy>daily</updatePolicy>
+                                               <checksumPolicy>warn</checksumPolicy>
+                                       </releases>
+                               </repository>
+                       </repositories>
                        <distributionManagement>
                                <repository>
-                                       <id>localrepo</id>
-                                       <name>Internal Release Repository</name>
-                                       <url>dav:http://localhost:7070/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+                                       <id>staging</id>
+                                       <url>dav:http://localhost:7080/data/java/argeo-2.1/</url>
+                                       <uniqueVersion>false</uniqueVersion>
                                </repository>
-                               <site>
-                                       <id>site</id>
-                                       <name>Argeo Commons Site</name>
-                                       <url>dav:http://localhost:7070/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}</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>
-                       </properties>
-               </profile>
        </profiles>
 </project>