From 48216df1d870744d4ae7486c6debe0ec626111ac Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 7 Nov 2021 12:03:53 +0100
Subject: [PATCH] Introduce CMS optional dependencies.

---
 demo/pom.xml                                  |   2 +-
 dep/org.argeo.dep.cms.ext/.gitignore          |   4 +
 dep/org.argeo.dep.cms.ext/META-INF/.gitignore |   1 +
 dep/org.argeo.dep.cms.ext/bnd.bnd             |   0
 dep/org.argeo.dep.cms.ext/build.properties    |   2 +
 dep/org.argeo.dep.cms.ext/p2.inf              |   2 +
 dep/org.argeo.dep.cms.ext/pom.xml             | 146 ++++++++++++++++++
 dep/org.argeo.dep.cms.sdk/pom.xml             |   3 +-
 dep/pom.xml                                   |   2 +-
 dist/argeo-node/pom.xml                       |   5 -
 10 files changed, 158 insertions(+), 9 deletions(-)
 create mode 100644 dep/org.argeo.dep.cms.ext/.gitignore
 create mode 100644 dep/org.argeo.dep.cms.ext/META-INF/.gitignore
 create mode 100644 dep/org.argeo.dep.cms.ext/bnd.bnd
 create mode 100644 dep/org.argeo.dep.cms.ext/build.properties
 create mode 100644 dep/org.argeo.dep.cms.ext/p2.inf
 create mode 100644 dep/org.argeo.dep.cms.ext/pom.xml

diff --git a/demo/pom.xml b/demo/pom.xml
index 56fe39f1f..97a5dcef7 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -41,7 +41,7 @@
 			<dependencies>
 				<dependency>
 					<groupId>org.argeo.commons</groupId>
-					<artifactId>org.argeo.dep.cms.sdk</artifactId>
+					<artifactId>org.argeo.dep.cms.e4.rap</artifactId>
 					<version>2.1.104-SNAPSHOT</version>
 				</dependency>
 			</dependencies>
diff --git a/dep/org.argeo.dep.cms.ext/.gitignore b/dep/org.argeo.dep.cms.ext/.gitignore
new file mode 100644
index 000000000..e26e09f82
--- /dev/null
+++ b/dep/org.argeo.dep.cms.ext/.gitignore
@@ -0,0 +1,4 @@
+/target/
+/feature.xml
+/modularDistribution.csv
+/*-maven.target
diff --git a/dep/org.argeo.dep.cms.ext/META-INF/.gitignore b/dep/org.argeo.dep.cms.ext/META-INF/.gitignore
new file mode 100644
index 000000000..4854a41b9
--- /dev/null
+++ b/dep/org.argeo.dep.cms.ext/META-INF/.gitignore
@@ -0,0 +1 @@
+/MANIFEST.MF
diff --git a/dep/org.argeo.dep.cms.ext/bnd.bnd b/dep/org.argeo.dep.cms.ext/bnd.bnd
new file mode 100644
index 000000000..e69de29bb
diff --git a/dep/org.argeo.dep.cms.ext/build.properties b/dep/org.argeo.dep.cms.ext/build.properties
new file mode 100644
index 000000000..edef3d9d1
--- /dev/null
+++ b/dep/org.argeo.dep.cms.ext/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+               modularDistribution.csv
diff --git a/dep/org.argeo.dep.cms.ext/p2.inf b/dep/org.argeo.dep.cms.ext/p2.inf
new file mode 100644
index 000000000..0423aa509
--- /dev/null
+++ b/dep/org.argeo.dep.cms.ext/p2.inf
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file
diff --git a/dep/org.argeo.dep.cms.ext/pom.xml b/dep/org.argeo.dep.cms.ext/pom.xml
new file mode 100644
index 000000000..f657231f4
--- /dev/null
+++ b/dep/org.argeo.dep.cms.ext/pom.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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>
+		<version>2.1.104-SNAPSHOT</version>
+		<artifactId>dep</artifactId>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.dep.cms.ext</artifactId>
+	<name>CMS Optional Third Parties</name>
+	<description>Bulky generic third parties which are not required by the CMS, but necessary for upper layers.</description>
+	<dependencies>
+		<!-- Additional Third Parties -->
+		<dependency>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.xml.bind</artifactId>
+		</dependency>
+
+		<!-- Jackson JSON processor -->
+		<dependency>
+			<groupId>org.argeo.tp.jackson</groupId>
+			<artifactId>com.fasterxml.jackson.core.jackson-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.jackson</groupId>
+			<artifactId>com.fasterxml.jackson.core.jackson-databind</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.jackson</groupId>
+			<artifactId>com.fasterxml.jackson.core.jackson-annotations</artifactId>
+		</dependency>
+
+		<!-- Mail -->
+		<dependency>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.activation</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.mail</artifactId>
+		</dependency>
+
+		<!-- POI requirements -->
+		<dependency>
+			<groupId>org.argeo.tp.apache.commons</groupId>
+			<artifactId>org.apache.commons.math3</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache.commons</groupId>
+			<artifactId>org.apache.commons.collections4</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.xml.security</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.xmlbeans</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.xalan</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.xalan.serializer</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.xml.resolver</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.xerces</artifactId>
+		</dependency>
+
+	</dependencies>
+
+	<profiles>
+		<profile>
+			<id>rpmbuild-tp</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>prepare-source-tp</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptorRefs>
+										<descriptorRef>a2-source-tp</descriptorRef>
+									</descriptorRefs>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-tp</id>
+								<phase>package</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>argeo-cms-ext-tp</name>
+									<projversion>${version.argeo-tp}</projversion>
+									<release>${maven.build.timestamp}</release>
+									<mappings>
+										<mapping>
+											<directory>/usr/share/osgi</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source-tp</location>
+													<includes>
+														<include>**/*.jar</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+									</mappings>
+									<requires>
+										<require>argeo-cms-node-tp</require>
+									</requires>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>
\ No newline at end of file
diff --git a/dep/org.argeo.dep.cms.sdk/pom.xml b/dep/org.argeo.dep.cms.sdk/pom.xml
index 24e03fbb1..1029790a2 100644
--- a/dep/org.argeo.dep.cms.sdk/pom.xml
+++ b/dep/org.argeo.dep.cms.sdk/pom.xml
@@ -13,7 +13,7 @@
 		<!-- Parent dependencies -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.dep.cms.e4.rap</artifactId>
+			<artifactId>org.argeo.dep.cms.ui.rap</artifactId>
 			<version>2.1.104-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
@@ -117,7 +117,6 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-platform-tp</require>
 									</requires>
 								</configuration>
 							</execution>
diff --git a/dep/pom.xml b/dep/pom.xml
index eb672e550..3293a560c 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -15,7 +15,7 @@
 		<module>org.argeo.dep.cms.node</module>
 		<module>org.argeo.dep.cms.ui.rap</module>
 		<module>org.argeo.dep.cms.e4.rap</module>
-		<module>org.argeo.dep.cms.sdk</module>
+		<module>org.argeo.dep.cms.ext</module>
 	</modules>
 	<build>
 		<plugins>
diff --git a/dist/argeo-node/pom.xml b/dist/argeo-node/pom.xml
index 11d17a729..452e8379c 100644
--- a/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@ -28,11 +28,6 @@
 					<artifactId>org.argeo.dep.cms.e4.rap</artifactId>
 					<version>2.1.104-SNAPSHOT</version>
 				</dependency>
-				<dependency>
-					<groupId>org.argeo.commons</groupId>
-					<artifactId>org.argeo.dep.cms.sdk</artifactId>
-					<version>2.1.104-SNAPSHOT</version>
-				</dependency>
 				<dependency>
 					<groupId>org.argeo.commons</groupId>
 					<artifactId>osgi-boot</artifactId>
-- 
2.30.2