X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=ae38497d9924344c2b563896e970370b2d48be1e;hb=08b6b3d0e38af8b6f3ff0f0b0a93f9675b235d63;hp=e3dbc0bd64b3f5afa4de001795c11cf7750c5f60;hpb=70427e16e3e9cf1de4c8aebd91d5da5a10e8dcc0;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index e3dbc0bd6..ae38497d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,18 +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.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.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.79</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>
@@ -26,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>
@@ -43,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>
@@ -218,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>
@@ -238,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>
@@ -257,14 +279,12 @@ 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>
@@ -278,38 +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> -->
-<!-- 						<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>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>
+					<artifactId>argeo-osgi-plugin</artifactId>
+					<version>2.1.1</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -327,6 +317,19 @@ limitations under the License.
 					</filesets>
 				</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>
@@ -359,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>
@@ -389,27 +398,8 @@ limitations under the License.
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
 		</repository>
-		<!-- Maven default repository -->
-<!-- 		<repository> -->
-<!-- 			<id>central</id> -->
-<!-- 			<url>http://repo1.maven.org/maven2</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/java/argeo-2.1</url>
@@ -420,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>
@@ -457,19 +435,13 @@ limitations under the License.
 					<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>
@@ -482,8 +454,7 @@ limitations under the License.
 					</reportSet>
 					<reportSet>
 						<id>javadoc</id>
-						<reports>
-						</reports>
+						<reports />
 					</reportSet>
 				</reportSets>
 			</plugin>
@@ -500,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>
@@ -547,10 +503,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>
@@ -575,10 +529,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>
@@ -589,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>