Adapt to updates and additions in Argeo TP

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

diff --git a/pom.xml b/pom.xml
index a4ed4009a3b4a44aad086cdcc3fb013d7172e359..02c0281bd71eee22f96144e138fe10af5a09c262 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,14 +5,13 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>2.1.74-SNAPSHOT</version>
+       <version>2.1.76-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.74-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-tp>2.1.20</version.argeo-tp>
+               <version.argeo-commons>2.1.76-SNAPSHOT</version.argeo-commons>
+               <version.argeo-tp>2.1.21</version.argeo-tp>
                <!-- RPM -->
                <argeo.rpm.release>7</argeo.rpm.release>
                <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
@@ -222,6 +221,16 @@ limitations under the License.
                                        <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>
                                        <artifactId>maven-release-plugin</artifactId>
                                        <version>2.5.1</version>
@@ -331,6 +340,12 @@ limitations under the License.
                        <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>
@@ -373,17 +388,6 @@ limitations under the License.
                        </releases>
                </pluginRepository>
        </pluginRepositories>
-       <distributionManagement>
-               <repository>
-                       <id>staging</id>
-                       <url>dav:https://forge.argeo.org/data/java/argeo-${developmentCycle.argeo-commons}</url>
-                       <uniqueVersion>false</uniqueVersion>
-               </repository>
-               <site>
-                       <id>staging</id>
-                       <url>dav:https://forge.argeo.org/data/docs/argeo-${developmentCycle.argeo-commons}</url>
-               </site>
-       </distributionManagement>
        <reporting>
                <plugins>
                        <plugin>
@@ -428,7 +432,7 @@ limitations under the License.
                                        </reportSet>
                                        <reportSet>
                                                <id>javadoc</id>
-                                               <reports></reports>
+                                               <reports />
                                        </reportSet>
                                </reportSets>
                        </plugin>
@@ -445,12 +449,23 @@ limitations under the License.
                                        </reportSet>
                                        <reportSet>
                                                <id>jxr</id>
-                                               <reports></reports>
+                                               <reports />
                                        </reportSet>
                                </reportSets>
                        </plugin>
                </plugins>
        </reporting>
+       <distributionManagement>
+               <repository>
+                       <id>staging</id>
+                       <url>dav:https://forge.argeo.org/data/java/argeo-2.1/</url>
+                       <uniqueVersion>false</uniqueVersion>
+               </repository>
+               <site>
+                       <id>staging</id>
+                       <url>file:///srv/docfactory/argeo-2.1/site/argeo-commons/</url>
+               </site>
+       </distributionManagement>
        <profiles>
                <profile>
                        <id>rpmbuild</id>
@@ -524,14 +539,9 @@ limitations under the License.
                        <distributionManagement>
                                <repository>
                                        <id>staging</id>
-                                       <url>dav:http://localhost:7080/data/java/argeo-${developmentCycle.argeo-commons}</url>
+                                       <url>dav:http://localhost:7080/data/java/argeo-2.1/</url>
                                        <uniqueVersion>false</uniqueVersion>
                                </repository>
-                               <site>
-                                       <id>staging</id>
-<!--                                   <url>dav:http://localhost:7080/data/docs/argeo-${developmentCycle.argeo-commons}</url> -->
-                                       <url>file:///home/mbaudier/tmp/site</url>
-                               </site>
                        </distributionManagement>
                </profile>
        </profiles>