From b8372c7bc652e8fb2fcc5c2047706553dae09875 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 14 Nov 2017 06:53:56 +0100
Subject: [PATCH] Improve project organisation

---
 dep/.gitignore                                |  1 +
 .../org.argeo.suite.platform/.gitignore       |  0
 .../META-INF/.gitignore                       |  0
 {sdk => dep}/org.argeo.suite.platform/bnd.bnd |  0
 {sdk => dep}/org.argeo.suite.platform/pom.xml | 10 +--
 dep/pom.xml                                   | 89 +++++++++++++++++++
 pom.xml                                       |  2 +-
 sdk/.project                                  | 11 ---
 sdk/pom.xml                                   | 33 -------
 9 files changed, 93 insertions(+), 53 deletions(-)
 create mode 100644 dep/.gitignore
 rename {sdk => dep}/org.argeo.suite.platform/.gitignore (100%)
 rename {sdk => dep}/org.argeo.suite.platform/META-INF/.gitignore (100%)
 rename {sdk => dep}/org.argeo.suite.platform/bnd.bnd (100%)
 rename {sdk => dep}/org.argeo.suite.platform/pom.xml (91%)
 create mode 100644 dep/pom.xml
 delete mode 100644 sdk/.project
 delete mode 100644 sdk/pom.xml

diff --git a/dep/.gitignore b/dep/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/dep/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/sdk/org.argeo.suite.platform/.gitignore b/dep/org.argeo.suite.platform/.gitignore
similarity index 100%
rename from sdk/org.argeo.suite.platform/.gitignore
rename to dep/org.argeo.suite.platform/.gitignore
diff --git a/sdk/org.argeo.suite.platform/META-INF/.gitignore b/dep/org.argeo.suite.platform/META-INF/.gitignore
similarity index 100%
rename from sdk/org.argeo.suite.platform/META-INF/.gitignore
rename to dep/org.argeo.suite.platform/META-INF/.gitignore
diff --git a/sdk/org.argeo.suite.platform/bnd.bnd b/dep/org.argeo.suite.platform/bnd.bnd
similarity index 100%
rename from sdk/org.argeo.suite.platform/bnd.bnd
rename to dep/org.argeo.suite.platform/bnd.bnd
diff --git a/sdk/org.argeo.suite.platform/pom.xml b/dep/org.argeo.suite.platform/pom.xml
similarity index 91%
rename from sdk/org.argeo.suite.platform/pom.xml
rename to dep/org.argeo.suite.platform/pom.xml
index e9df68c..932dd33 100644
--- a/sdk/org.argeo.suite.platform/pom.xml
+++ b/dep/org.argeo.suite.platform/pom.xml
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.suite</groupId>
-		<artifactId>sdk</artifactId>
+		<artifactId>dep</artifactId>
 		<version>0.1.12-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.suite.platform</artifactId>
-	<name>Argeo Suite Minimal SDK</name>
+	<name>Argeo Suite Platform</name>
 	<packaging>jar</packaging>
 	<dependencies>
 		<!-- Default Assembly for supported minimal set of Argeo Suite Features -->		
@@ -34,12 +34,6 @@
 			<artifactId>org.argeo.connect.platform</artifactId>
 			<version>${version.argeo-connect}</version>
 		</dependency>
-		<!-- We put all third parties in the target platform -->
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>argeo-tp</artifactId>
-			<version>${version.argeo-distribution}</version>
-		</dependency>
 	</dependencies>
 		<profiles>
 		<profile>
diff --git a/dep/pom.xml b/dep/pom.xml
new file mode 100644
index 0000000..71b7593
--- /dev/null
+++ b/dep/pom.xml
@@ -0,0 +1,89 @@
+<?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.suite</groupId>
+		<artifactId>argeo-suite</artifactId>
+		<version>0.1.12-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>dep</artifactId>
+	<name>Argeo Suite Dependencies</name>
+	<packaging>pom</packaging>
+	<modules>
+		<module>org.argeo.suite.platform</module>
+	</modules>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<configuration>
+					<instructions>
+						<SLC-ModularDistribution>default</SLC-ModularDistribution>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.argeo.maven.plugins</groupId>
+				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-descriptors</id>
+						<goals>
+							<goal>descriptors</goal>
+						</goals>
+						<phase>generate-resources</phase>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<!-- SDK -->
+		<dependency>
+			<groupId>org.argeo.tp.equinox</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.sdk</groupId>
+			<artifactId>org.junit</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>check-osgi</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>check-osgi</id>
+								<phase>test</phase>
+								<goals>
+									<goal>equinox</goal>
+								</goals>
+								<configuration>
+									<onlyCheck>true</onlyCheck>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+				<!-- OSGi test -->
+				<dependency>
+					<groupId>org.argeo.commons</groupId>
+					<artifactId>org.argeo.osgi.boot</artifactId>
+					<version>${version.argeo-commons}</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+</project>
diff --git a/pom.xml b/pom.xml
index c6f09cd..37be851 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 		<module>org.argeo.suite.workbench.rap</module>
 		<module>org.argeo.suite.apps</module>
 		<module>org.argeo.suite.apps.web</module>
-		<module>sdk</module>
+		<module>dep</module>
 	</modules>
 	<properties>
 		<version.argeo-suite>0.1.12-SNAPSHOT</version.argeo-suite>
diff --git a/sdk/.project b/sdk/.project
deleted file mode 100644
index d95f518..0000000
--- a/sdk/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>argeo-suite-sdk</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/sdk/pom.xml b/sdk/pom.xml
deleted file mode 100644
index a827caf..0000000
--- a/sdk/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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.suite</groupId>
-		<artifactId>argeo-suite</artifactId>
-		<version>0.1.12-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<artifactId>sdk</artifactId>
-	<name>Argeo Suite SDKs</name>
-	<packaging>pom</packaging>
-	<modules>
-		<module>org.argeo.suite.platform</module>
-	</modules>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>generate-descriptors</id>
-						<goals>
-							<goal>descriptors</goal>
-						</goals>
-						<phase>generate-resources</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
-- 
2.30.2