Improve dependencies

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

diff --git a/pom.xml b/pom.xml
index 3ccd784a9e8257ee1e2d606a10800c5f5ce4f2b8..c6c2ec30d3eb5185c7d479c175c6964f74ff83de 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,15 +3,13 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>2.1.75-SNAPSHOT</version>
+       <version>2.1.78-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</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.78-SNAPSHOT</version.argeo-commons>
+               <version.argeo-tp>2.1.24</version.argeo-tp>
                <!-- RPM -->
                <argeo.rpm.release>7</argeo.rpm.release>
                <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
@@ -25,6 +23,7 @@
                <module>org.argeo.enterprise</module>
                <module>org.argeo.jcr</module>
                <module>org.argeo.osgi.boot</module>
+               <module>org.argeo.core</module>
                <!-- Eclipse -->
                <module>org.argeo.eclipse.ui</module>
                <module>org.argeo.eclipse.ui.rap</module>
@@ -42,6 +41,7 @@
                <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>
@@ -221,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>
@@ -280,7 +290,7 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.argeo.maven.plugins</groupId>
                                        <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                       <version>1.1.6</version>
+                                       <version>1.2.0</version>
                                </plugin>
                        </plugins>
                </pluginManagement>
@@ -330,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>
@@ -447,7 +463,7 @@ limitations under the License.
                </repository>
                <site>
                        <id>staging</id>
-                       <url>dav:https://forge.argeo.org/data/docs/argeo-2.1/site/argeo-commons/</url>
+                       <url>file:///srv/docfactory/argeo-2.1/site/argeo-commons/</url>
                </site>
        </distributionManagement>
        <profiles>
@@ -522,10 +538,6 @@ limitations under the License.
                                        <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-2.1/site/argeo-commons/</url>
-                               </site>
                        </distributionManagement>
                </profile>
        </profiles>