X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=09ef7c84b075fcf5cd2e5562149e577eb212e397;hb=43aefb725d6d31eaf183c826f9cc67cf10e5d99c;hp=a6ae50147503b72bfdee61cbde3437b633151089;hpb=fff8ef697c09812655ada19ab7c80f2a523ab59a;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index a6ae50147..09ef7c84b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,20 +1,23 @@
 <?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">
 	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.maven</groupId>
+		<artifactId>argeo-osgi-parent</artifactId>
+		<version>2.1.2</version>
+	</parent>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>2.1.79-SNAPSHOT</version>
+	<version>2.1.86</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.78</version.argeo-commons>
-		<version.argeo-tp>2.1.24</version.argeo-tp>
+		<version.argeo-commons>2.1.86</version.argeo-commons>
+		<version.argeo-tp>2.1.27</version.argeo-tp>
 		<!-- RPM -->
 		<argeo.rpm.release>7</argeo.rpm.release>
 		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
-		<!-- Encoding, see http://is.gd/mvn_source_encoding -->
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.scm.id>code.argeo.org</project.scm.id>
 	</properties>
 	<modules>
@@ -36,26 +39,20 @@
 		<!-- 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>
 		<url>http://git.argeo.org/?p=apache2/argeo-commons.git;a=summary</url>
 		<developerConnection>scm:git:https://code.argeo.org/git/apache2/argeo-commons.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>argeo-commons-2.1.86</tag>
 	</scm>
 	<inceptionYear>2007</inceptionYear>
 	<licenses>
@@ -83,279 +80,6 @@ limitations under the License.
 			</comments>
 		</license>
 	</licenses>
-	<build>
-		<extensions>
-			<extension>
-				<groupId>org.apache.maven.wagon</groupId>
-				<artifactId>wagon-webdav-jackrabbit</artifactId>
-				<version>2.10</version>
-			</extension>
-		</extensions>
-		<sourceDirectory>src</sourceDirectory>
-		<testSourceDirectory>ext/test</testSourceDirectory>
-		<resources>
-			<resource>
-				<directory>src</directory>
-				<includes>
-					<include>**</include>
-				</includes>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</resource>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>**</include>
-				</includes>
-				<excludes>
-					<exclude>.*</exclude>
-					<exclude>.*/**</exclude>
-					<exclude>src/**</exclude>
-					<exclude>ext/**</exclude>
-					<exclude>target/**</exclude>
-					<exclude>bin/**</exclude>
-					<exclude>pom.xml</exclude>
-					<exclude>build.properties</exclude>
-					<exclude>*.bnd</exclude>
-					<exclude>*.target</exclude>
-					<exclude>**/*.xcf</exclude>
-				</excludes>
-			</resource>
-		</resources>
-		<testResources>
-			<testResource>
-				<directory>ext/test</directory>
-				<includes>
-					<include>**</include>
-				</includes>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</testResource>
-		</testResources>
-		<pluginManagement>
-			<plugins>
-				<!-- Maven -->
-				<plugin>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.3</version>
-					<configuration>
-						<source>1.8</source>
-						<target>1.8</target>
-						<compilerId>eclipse</compilerId>
-						<!-- Required for compliance level, see http://jira.codehaus.org/browse/PLXCOMP-231 -->
-						<optimize>true</optimize>
-						<!-- Hack to work around issues with generated annotations : -->
-						<generatedSourcesDirectory>target/classes</generatedSourcesDirectory>
-						<generatedTestSourcesDirectory>target/test-classes</generatedTestSourcesDirectory>
-					</configuration>
-					<dependencies>
-						<dependency>
-							<groupId>org.codehaus.plexus</groupId>
-							<artifactId>plexus-compiler-eclipse</artifactId>
-							<version>2.6</version>
-						</dependency>
-					</dependencies>
-				</plugin>
-				<plugin>
-					<artifactId>maven-source-plugin</artifactId>
-					<version>2.4</version>
-					<executions>
-						<execution>
-							<id>attach-sources</id>
-							<phase>package</phase>
-							<goals>
-								<goal>jar</goal>
-							</goals>
-						</execution>
-					</executions>
-					<configuration>
-						<excludes>
-							<!-- Prevents source jars to contain misleading data -->
-							<exclude>plugin.xml</exclude>
-							<exclude>META-INF/MANIFEST.MF</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-				<plugin>
-					<artifactId>maven-clean-plugin</artifactId>
-					<version>2.6.1</version>
-					<configuration>
-						<filesets>
-							<fileset>
-								<directory>META-INF</directory>
-								<includes>
-									<include>MANIFEST.MF</include>
-								</includes>
-							</fileset>
-						</filesets>
-					</configuration>
-				</plugin>
-				<plugin>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.18</version>
-				</plugin>
-				<plugin>
-					<artifactId>maven-jar-plugin</artifactId>
-					<version>2.5</version>
-					<configuration>
-						<archive>
-							<manifestFile>META-INF/MANIFEST.MF</manifestFile>
-						</archive>
-					</configuration>
-				</plugin>
-				<plugin>
-					<artifactId>maven-antrun-plugin</artifactId>
-					<version>1.8</version>
-				</plugin>
-				<plugin>
-					<artifactId>maven-resources-plugin</artifactId>
-					<version>2.7</version>
-				</plugin>
-				<plugin>
-					<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>
-					<configuration>
-						<autoVersionSubmodules>true</autoVersionSubmodules>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.felix</groupId>
-					<artifactId>maven-bundle-plugin</artifactId>
-					<version>3.0.1</version>
-					<extensions>true</extensions>
-					<configuration>
-						<manifestLocation>META-INF</manifestLocation>
-						<instructions>
-							<_include>bnd.bnd</_include>
-							<Bundle-Version>${project.version}-r${tstamp}</Bundle-Version>
-							<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-							<Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
-							<_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
-							<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>
-						<execution>
-							<id>bundle-manifest</id>
-							<phase>process-classes</phase>
-							<goals>
-								<goal>manifest</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-				<!-- Codehaus -->
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>rpm-maven-plugin</artifactId>
-					<version>2.1.4</version>
-					<extensions>true</extensions>
-					<configuration>
-						<version>${project.version}</version>
-						<distribution>argeo${argeo.rpm.release}</distribution>
-						<group>Applications/System</group>
-						<prefix>/usr</prefix>
-						<defaultDirMode>755</defaultDirMode>
-						<defaultFileMode>644</defaultFileMode>
-						<autoRequires>false</autoRequires>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>exec-maven-plugin</artifactId>
-					<version>1.3.2</version>
-				</plugin>
-				<!-- Argeo -->
-				<plugin>
-					<groupId>org.argeo.maven.plugins</groupId>
-					<artifactId>argeo-osgi-plugin</artifactId>
-					<version>2.1.1</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
-				<configuration>
-					<filesets>
-						<fileset>
-							<directory>META-INF</directory>
-							<includes>
-								<include>MANIFEST.MF</include>
-							</includes>
-						</fileset>
-					</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>
-					<encoding>UTF-8</encoding>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-site-plugin</artifactId>
-				<inherited>false</inherited>
-				<configuration>
-					<skip>false</skip>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-release-plugin</artifactId>
-				<configuration>
-					<goals>deploy</goals>
-					<releaseProfiles>rpmbuild,rpmbuild-tp</releaseProfiles>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
@@ -367,6 +91,15 @@ limitations under the License.
 					<groupId>org.argeo.tp.apache</groupId>
 					<artifactId>org.apache.xerces</artifactId>
 				</exclusion>
+				<!-- Avoid slf4j implementations lurking in the classpath. -->
+				<exclusion>
+					<groupId>org.argeo.tp.sdk</groupId>
+					<artifactId>biz.aQute.bndlib</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.misc</groupId>
+					<artifactId>slf4j.osgi</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 	</dependencies>
@@ -388,159 +121,60 @@ limitations under the License.
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
+	<distributionManagement>
+		<repository>
+			<id>staging</id>
+			<url>dav:https://forge.argeo.org/data/java/argeo-2.1/</url>
+			<uniqueVersion>false</uniqueVersion>
+		</repository>
+		<snapshotRepository>
+			<id>staging</id>
+			<url>file:///srv/javafactory/argeo-2.1</url>
+			<uniqueVersion>true</uniqueVersion>
+		</snapshotRepository>
+		<site>
+			<id>staging</id>
+			<url>file:///srv/docfactory/argeo-2.1/site/argeo-commons/</url>
+		</site>
+	</distributionManagement>
 	<repositories>
 		<repository>
 			<id>argeo</id>
 			<url>http://repo.argeo.org/data/java/argeo-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
+				<updatePolicy>never</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
 		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>argeo-maven-plugins</id>
-			<url>http://repo.argeo.org/data/java/argeo-2.1</url>
+		<repository>
+			<id>argeo-snapshots</id>
+			<url>http://snapshots.argeo.org/data/java/argeo-2.1/</url>
 			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
 				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
+				<updatePolicy>always</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-		</pluginRepository>
-	</pluginRepositories>
-	<reporting>
-		<plugins>
-			<plugin>
-				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>2.9</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>
-					<failOnError>false</failOnError>
-					<additionalJOption>-Xdoclint:none</additionalJOption>
-					<excludePackageNames>*.internal.*,org.eclipse.*</excludePackageNames>
-					<encoding>UTF-8</encoding>
-					<detectLinks>true</detectLinks>
-					<links>
-						<link>http://docs.oracle.com/javase/8/docs/api</link>
-						<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>
-					</links>
-				</configuration>
-				<reportSets>
-					<reportSet>
-						<id>aggregate-javadoc</id>
-						<inherited>false</inherited>
-						<reports>
-							<report>aggregate</report>
-						</reports>
-					</reportSet>
-					<reportSet>
-						<id>javadoc</id>
-						<reports />
-					</reportSet>
-				</reportSets>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jxr-plugin</artifactId>
-				<version>2.5</version>
-				<reportSets>
-					<reportSet>
-						<id>aggregate-jxr</id>
-						<inherited>false</inherited>
-						<reports>
-							<report>aggregate</report>
-						</reports>
-					</reportSet>
-					<reportSet>
-						<id>jxr</id>
-						<reports />
-					</reportSet>
-				</reportSets>
-			</plugin>
-		</plugins>
-	</reporting>
-	<distributionManagement>
+			</snapshots>
+		</repository>
+		<!-- Disable Maven default repository -->
 		<repository>
-			<id>staging</id>
-			<url>dav:https://forge.argeo.org/data/java/argeo-2.1/</url>
-			<uniqueVersion>false</uniqueVersion>
+			<id>central</id>
+			<url>http://repo1.maven.org/maven2</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
 		</repository>
-		<site>
-			<id>staging</id>
-			<url>file:///srv/docfactory/argeo-2.1/site/argeo-commons/</url>
-		</site>
-	</distributionManagement>
+	</repositories>
 	<profiles>
-		<profile>
-			<id>rpmbuild</id>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>install</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<target>
-										<copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
-											<flattenmapper />
-										</copy>
-									</target>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>rpmbuild-tp</id>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>install</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<target>
-										<copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
-											<flattenmapper />
-										</copy>
-									</target>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 		<profile>
 			<id>localrepo</id>
 			<repositories>