From 6f418ade53dbb84ffc656a21ab45673212122209 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 19 Feb 2020 09:48:02 +0100
Subject: [PATCH] Adapt to changes in Argeo Platform and introduce Argeo Suite
 Lib.

---
 lib/.gitignore |   1 +
 lib/pom.xml    | 167 +++++++++++++++++++++++++++++++++++++++++++++++++
 pom.xml        |  51 +++++++++++++--
 3 files changed, 214 insertions(+), 5 deletions(-)
 create mode 100644 lib/.gitignore
 create mode 100644 lib/pom.xml

diff --git a/lib/.gitignore b/lib/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/lib/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/lib/pom.xml b/lib/pom.xml
new file mode 100644
index 0000000..287598e
--- /dev/null
+++ b/lib/pom.xml
@@ -0,0 +1,167 @@
+<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.suite</groupId>
+	<artifactId>argeo-suite-lib</artifactId>
+	<packaging>pom</packaging>
+	<name>Parent POM for Argeo Suite Extensions</name>
+	<description />
+	<version>2.1.16-SNAPSHOT</version>
+	<properties>
+		<!-- Dependencies -->
+		<version.argeo-tp>2.1.27</version.argeo-tp>
+		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
+		<version.argeo-commons>2.1.86-SNAPSHOT</version.argeo-commons>
+		<version.argeo-connect>2.1.82-SNAPSHOT</version.argeo-connect>
+		<version.argeo-slc>2.1.17-SNAPSHOT</version.argeo-slc>
+
+		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-gpl/el7</argeo.rpm.stagingRepository>
+		<git.rw />
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.tp.equinox</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.suite</groupId>
+			<artifactId>org.argeo.suite.dep.e4.rap</artifactId>
+			<version>2.1.16-SNAPSHOT</version>
+			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<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>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.argeo.tp</groupId>
+				<artifactId>argeo-tp</artifactId>
+				<version>${version.argeo-tp}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.tp</groupId>
+				<artifactId>argeo-tp-rap-e4</artifactId>
+				<version>${version.argeo-tp}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.tp.extras</groupId>
+				<artifactId>argeo-tp-extras</artifactId>
+				<version>${version.argeo-tp-extras}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+	<repositories>
+		<repository>
+			<id>argeo</id>
+			<url>http://repo.argeo.org/data/java/argeo-2.1</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+		</repository>
+		<repository>
+			<id>argeo-extras</id>
+			<url>http://repo.argeo.org/data/java/argeo-extras-2.1</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+		</repository>
+	</repositories>
+	<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>
+</project>
diff --git a/pom.xml b/pom.xml
index fc113f7..994e739 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,9 @@
 <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.commons</groupId>
-		<artifactId>argeo-commons</artifactId>
-		<version>2.1.85-SNAPSHOT</version>
+		<groupId>org.argeo.maven</groupId>
+		<artifactId>argeo-osgi-parent</artifactId>
+		<version>2.1.2</version>
 	</parent>
 	<groupId>org.argeo.suite</groupId>
 	<artifactId>argeo-suite</artifactId>
@@ -12,12 +12,15 @@
 	<description />
 	<version>2.1.16-SNAPSHOT</version>
 	<properties>
-		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-gpl/el7</argeo.rpm.stagingRepository>
 		<version.argeo-suite>2.1.16-SNAPSHOT</version.argeo-suite>
 		<!-- Dependencies -->
+		<version.argeo-tp>2.1.27</version.argeo-tp>
+		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
+		<version.argeo-commons>2.1.86-SNAPSHOT</version.argeo-commons>
 		<version.argeo-connect>2.1.82-SNAPSHOT</version.argeo-connect>
 		<version.argeo-slc>2.1.17-SNAPSHOT</version.argeo-slc>
-		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
+
+		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-gpl/el7</argeo.rpm.stagingRepository>
 		<git.rw />
 	</properties>
 	<modules>
@@ -34,6 +37,7 @@
 
 		<module>dep</module>
 		<module>dist</module>
+		<module>lib</module>
 	</modules>
 	<scm>
 		<connection>scm:git:http://git.argeo.org/gpl/argeo-suite.git</connection>
@@ -89,8 +93,45 @@ which are used as well as that of the covered work.]]>
 			</roles>
 		</developer>
 	</developers>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<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>
+				<!-- 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>
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>org.argeo.tp</groupId>
+				<artifactId>argeo-tp</artifactId>
+				<version>${version.argeo-tp}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.tp</groupId>
+				<artifactId>argeo-tp-rap-e4</artifactId>
+				<version>${version.argeo-tp}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.argeo.tp.extras</groupId>
 				<artifactId>argeo-tp-extras</artifactId>
-- 
2.30.2