X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=f31feb14206cd75108d6debbf1cfccebff1c82bf;hb=96416304c3f8cf0eb8dc1425bbe06649f9b4f7a8;hp=24e17a28c0c33e043528299bb10c1029127333d2;hpb=b58fe162d2c7adf0aa6c54ee575e75ecebff11bf;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 24e17a28c..f31feb142 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,14 +3,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>2.1.73-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.73-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.80-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>
@@ -24,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>
@@ -31,17 +31,25 @@
 		<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>
 	<scm>
 		<connection>scm:git:http://git.argeo.org/apache2/argeo-commons.git</connection>
@@ -209,6 +217,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>
@@ -216,11 +243,6 @@ limitations under the License.
 						<autoVersionSubmodules>true</autoVersionSubmodules>
 					</configuration>
 				</plugin>
-				<!-- <plugin> -->
-				<!-- <artifactId>maven-javadoc-plugin</artifactId> -->
-				<!-- <version>2.10.4</version> -->
-				<!-- </plugin> -->
-				<!-- Apache -->
 				<plugin>
 					<groupId>org.apache.felix</groupId>
 					<artifactId>maven-bundle-plugin</artifactId>
@@ -234,8 +256,12 @@ limitations under the License.
 							<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 							<Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
 							<_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
-							<!-- SLC specific instructions -->
+							<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>
@@ -253,16 +279,15 @@ limitations under the License.
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>rpm-maven-plugin</artifactId>
 					<version>2.1.4</version>
-					<!-- <version>2.1-alpha-1</version> -->
 					<extensions>true</extensions>
 					<configuration>
 						<version>${project.version}</version>
 						<distribution>argeo${argeo.rpm.release}</distribution>
 						<group>Applications/System</group>
 						<prefix>/usr</prefix>
-						<!-- <copyTo>${argeo.rpm.stagingRepository}</copyTo> -->
 						<defaultDirMode>755</defaultDirMode>
 						<defaultFileMode>644</defaultFileMode>
+						<autoRequires>false</autoRequires>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -273,99 +298,8 @@ limitations under the License.
 				<!-- Argeo -->
 				<plugin>
 					<groupId>org.argeo.maven.plugins</groupId>
-					<artifactId>maven-argeo-osgi-plugin</artifactId>
-					<version>1.1.6</version>
-				</plugin>
-				<!-- Site -->
-				<plugin>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.0.0</version>
-					<configuration>
-						<encoding>UTF-8</encoding>
-						<detectLinks>true</detectLinks>
-						<!-- <sourcepath>src</sourcepath> -->
-						<links>
-							<!-- Java -->
-							<link>http://docs.oracle.com/javase/8/docs/api</link>
-							<!-- OSGi -->
-							<link>http://www.osgi.org/javadoc/r5/core</link>
-							<link>http://www.osgi.org/javadoc/r5/enterprise</link>
-							<!-- Spring -->
-							<link>http://docs.spring.io/spring/docs/3.2.x/javadoc-api</link>
-							<!-- JCR -->
-							<link>http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0</link>
-							<!-- Eclipse -->
-							<link>http://help.eclipse.org/neon/topic/org.eclipse.platform.doc.isv/reference/api</link>
-						</links>
-					</configuration>
-				</plugin>
-				<plugin>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.7</version>
-					<!-- <configuration> -->
-					<!-- <siteDirectory>doc/site</siteDirectory> -->
-					<!-- <generateSitemap>true</generateSitemap> -->
-					<!-- <skip>false</skip> -->
-					<!-- <reportPlugins> -->
-					<!-- <plugin> -->
-					<!-- <groupId>org.apache.maven.plugins</groupId> -->
-					<!-- <artifactId>maven-project-info-reports-plugin</artifactId> -->
-					<!-- <version>2.8.1</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> -->
-					<!-- <encoding>UTF-8</encoding> -->
-					<!-- <detectLinks>true</detectLinks> -->
-					<!-- <sourcepath>src</sourcepath> -->
-					<!-- <links> -->
-					<!-- Java -->
-					<!-- <link>http://docs.oracle.com/javase/8/docs/api</link> -->
-					<!-- OSGi -->
-					<!-- <link>http://www.osgi.org/javadoc/r5/core</link> -->
-					<!-- <link>http://www.osgi.org/javadoc/r5/enterprise</link> -->
-					<!-- Spring -->
-					<!-- <link>http://docs.spring.io/spring/docs/3.2.x/javadoc-api</link> -->
-					<!-- JCR -->
-					<!-- <link>http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0</link> -->
-					<!-- Eclipse -->
-					<!-- <link>http://help.eclipse.org/neon/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.5</version> -->
-					<!-- <reportSets> -->
-					<!-- <reportSet> -->
-					<!-- <id>aggregate</id> -->
-					<!-- <reports> -->
-					<!-- <report>aggregate</report> -->
-					<!-- </reports> -->
-					<!-- </reportSet> -->
-					<!-- </reportSets> -->
-					<!-- </plugin> -->
-					<!-- </reportPlugins> -->
-					<!-- </configuration> -->
+					<artifactId>argeo-osgi-plugin</artifactId>
+					<version>2.1.1</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -384,10 +318,17 @@ limitations under the License.
 				</configuration>
 			</plugin>
 			<!-- <plugin> -->
-			<!-- <artifactId>maven-javadoc-plugin</artifactId> -->
-			<!-- <configuration> -->
-			<!-- <skip>true</skip> -->
-			<!-- </configuration> -->
+			<!-- <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>
@@ -421,6 +362,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>
@@ -444,38 +391,18 @@ limitations under the License.
 	<repositories>
 		<repository>
 			<id>argeo</id>
-			<url>http://forge.argeo.org/data/java/argeo-2.1/</url>
+			<url>http://repo.argeo.org/data/java/argeo-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
 		</repository>
-		<!-- Disable Maven default repository -->
-		<repository>
-			<id>central</id>
-			<url>http://repo1.maven.org/maven2</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</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>
@@ -483,21 +410,9 @@ 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>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-project-info-reports-plugin</artifactId>
 				<version>2.9</version>
 				<reportSets>
@@ -515,21 +430,18 @@ limitations under the License.
 				<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>
-					<!-- <sourcepath>src</sourcepath> -->
 					<links>
-						<!-- Java -->
 						<link>http://docs.oracle.com/javase/8/docs/api</link>
-						<!-- OSGi -->
-						<link>http://www.osgi.org/javadoc/r5/core</link>
-						<link>http://www.osgi.org/javadoc/r5/enterprise</link>
-						<!-- Spring -->
+						<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>
-						<!-- JCR -->
-						<link>http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0</link>
-						<!-- Eclipse -->
-						<link>http://help.eclipse.org/neon/topic/org.eclipse.platform.doc.isv/reference/api</link>
 					</links>
 				</configuration>
 				<reportSets>
@@ -542,8 +454,7 @@ limitations under the License.
 					</reportSet>
 					<reportSet>
 						<id>javadoc</id>
-						<reports>
-						</reports>
+						<reports />
 					</reportSet>
 				</reportSets>
 			</plugin>
@@ -560,39 +471,24 @@ 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>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>staging</id>
-					<url>dav:http://localhost:7080/data/java/argeo-${developmentCycle.argeo-commons}</url>
-					<uniqueVersion>false</uniqueVersion>
-				</repository>
-				<site>
-					<id>staging</id>
-					<url>dav:http://localhost:7080/data/docs/argeo-${developmentCycle.argeo-commons}</url>
-				</site>
-			</distributionManagement>
-		</profile>
 		<profile>
 			<id>rpmbuild</id>
 			<build>
@@ -645,5 +541,26 @@ limitations under the License.
 				</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>staging</id>
+					<url>dav:http://localhost:7080/data/java/argeo-2.1/</url>
+					<uniqueVersion>false</uniqueVersion>
+				</repository>
+			</distributionManagement>
+		</profile>
 	</profiles>
 </project>