X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=bf3ad91ecf31aa2a584d87009dce066ac4eea334;hb=b6e64316eb5472b68f4673cbda3f1e375defe8fe;hp=ac9c136c89fc217afcf894b485663928463e0688;hpb=160407cfefd389d463cc5cdfce80733ce54ce7fd;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index ac9c136c8..bf3ad91ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,19 +1,15 @@
 <?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>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>2.1.74-SNAPSHOT</version>
+	<version>2.1.77-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.77-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>
@@ -27,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>
@@ -44,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>
@@ -223,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>
@@ -332,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>
@@ -418,7 +432,7 @@ limitations under the License.
 					</reportSet>
 					<reportSet>
 						<id>javadoc</id>
-						<reports></reports>
+						<reports />
 					</reportSet>
 				</reportSets>
 			</plugin>
@@ -435,7 +449,7 @@ limitations under the License.
 					</reportSet>
 					<reportSet>
 						<id>jxr</id>
-						<reports></reports>
+						<reports />
 					</reportSet>
 				</reportSets>
 			</plugin>
@@ -449,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>
@@ -467,10 +481,8 @@ limitations under the License.
 								</goals>
 								<configuration>
 									<target>
-										<copy todir="${argeo.rpm.stagingRepository}" quiet="true"
-											failonerror="false">
-											<fileset dir="${project.build.directory}/rpm"
-												includes="*/RPMS/**/*.rpm" />
+										<copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
+											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
 											<flattenmapper />
 										</copy>
 									</target>
@@ -495,10 +507,8 @@ limitations under the License.
 								</goals>
 								<configuration>
 									<target>
-										<copy todir="${argeo.rpm.stagingRepository}" quiet="true"
-											failonerror="false">
-											<fileset dir="${project.build.directory}/rpm"
-												includes="*/RPMS/**/*.rpm" />
+										<copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
+											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
 											<flattenmapper />
 										</copy>
 									</target>
@@ -528,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>