Improve project organisation
authorMathieu Baudier <mbaudier@argeo.org>
Tue, 14 Nov 2017 05:53:56 +0000 (06:53 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Tue, 14 Nov 2017 05:53:56 +0000 (06:53 +0100)
dep/.gitignore [new file with mode: 0644]
dep/org.argeo.suite.platform/.gitignore [moved from sdk/org.argeo.suite.platform/.gitignore with 100% similarity]
dep/org.argeo.suite.platform/META-INF/.gitignore [moved from sdk/org.argeo.suite.platform/META-INF/.gitignore with 100% similarity]
dep/org.argeo.suite.platform/bnd.bnd [moved from sdk/org.argeo.suite.platform/bnd.bnd with 100% similarity]
dep/org.argeo.suite.platform/pom.xml [moved from sdk/org.argeo.suite.platform/pom.xml with 91% similarity]
dep/pom.xml [new file with mode: 0644]
pom.xml
sdk/.project [deleted file]
sdk/pom.xml [deleted file]

diff --git a/dep/.gitignore b/dep/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
@@ -0,0 +1 @@
+/target/
similarity index 91%
rename from sdk/org.argeo.suite.platform/pom.xml
rename to dep/org.argeo.suite.platform/pom.xml
index e9df68c756a09e783fad4c1e6fa1027b2ce5d0df..932dd33d751b3617f32f62738b64fa323c320e6e 100644 (file)
@@ -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 -->             
                        <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 (file)
index 0000000..71b7593
--- /dev/null
@@ -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 c6f09cdc06642d1390a418778268765781ab7b2d..37be8514ede578c7d4c408ef135a8bf99aaccd25 100644 (file)
--- 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 (file)
index d95f518..0000000
+++ /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 (file)
index a827caf..0000000
+++ /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>