Introduce Lib and Dep minimal

git-svn-id: https://svn.argeo.org/slc/trunk@5637 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml
new file mode 100644 (file)
index 0000000..d80e061
--- /dev/null
+++ b/dep/org.argeo.slc.dep.minimal/pom.xml
@@ -0,0 +1,186 @@
+<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.slc</groupId>
+               <artifactId>dep</artifactId>
+               <version>1.1.4-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.dep.minimal</artifactId>
+       <name>SLC Minimal Dependencies</name>
+       <description>The minimal set of dependencies required to run an SLC execution</description>
+       <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>
+       <dependencies>
+               <!-- SLC Agent -->
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.core</artifactId>
+                       <version>1.1.4-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.support.jcr</artifactId>
+                       <version>1.1.4-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.support.osgi</artifactId>
+                       <version>1.1.4-SNAPSHOT</version>
+               </dependency>
+
+               <!-- SLC Agent Modules -->
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.agent</artifactId>
+                       <version>1.1.4-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.agent.jcr</artifactId>
+                       <version>1.1.4-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.node.jackrabbit</artifactId>
+                       <version>1.1.4-SNAPSHOT</version>
+               </dependency>
+
+
+               <!-- Node subset -->
+               <!-- Default JCR repositories configurations -->
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.node.repo.jackrabbit</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.node.repofactory.jackrabbit</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+
+               <!-- OSGi Boot (and Equinox) -->
+               <dependency>
+                       <groupId>org.argeo.commons.base</groupId>
+                       <artifactId>org.argeo.osgi.boot</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+
+               <!-- Logging -->
+               <dependency>
+                       <groupId>org.argeo.commons.base</groupId>
+                       <artifactId>org.argeo.dep.log4j</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <type>pom</type>
+               </dependency>
+
+               <!-- Argeo Security -->
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.core</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.argeo.tp</groupId>
+                                       <artifactId>bcprov</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+
+               <!-- Xerces and Xalan -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.xmlcommons</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.xalan</artifactId>
+               </dependency>
+
+               <!-- Javax -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.annotation</artifactId>
+               </dependency>
+
+               <!-- Spring OSGi -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.springframework.osgi.extender</artifactId>
+               </dependency>
+
+               <!-- Jackrabbit -->
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.jackrabbit</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.jackrabbit</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+
+               <!-- Security (Jackrabbit) -->
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.dao.jackrabbit</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+
+               <!-- Security (Standalone) -->
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.dao.os</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+
+               <!-- DB drivers -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp</groupId> -->
+<!--                   <artifactId>org.h2</artifactId> -->
+<!--           </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>
+               </profile>
+       </profiles>
+</project>
\ No newline at end of file

diff --git a/dep/org.argeo.slc.dep.rap/pom.xml b/dep/org.argeo.slc.dep.rap/pom.xml
index 0a53d02755a27bb4a87c0a07520712d430a218cd..7656568b78dd390c21ab01cfea2d627cfa5aa626 100644 (file)
--- a/dep/org.argeo.slc.dep.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.rap/pom.xml
@@ -43,6 +43,20 @@
                        <artifactId>org.argeo.security.dep.node.rap</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
+
+               <!-- For target platform generation -->
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.unit</artifactId>
+                       <version>1.1.4-SNAPSHOT</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.support.maven</artifactId>
+                       <version>1.1.4-SNAPSHOT</version>
+                       <scope>test</scope>
+               </dependency>
        </dependencies>
        <profiles>
                <profile>

diff --git a/dep/org.argeo.slc.dep.rcp/pom.xml b/dep/org.argeo.slc.dep.rcp/pom.xml
index 1e8754b8a62d5b495b17d2a0592e9675d7cfb16a..c8d0ebb855943d2f872c35e173a3029a0d7e205c 100644 (file)
--- a/dep/org.argeo.slc.dep.rcp/pom.xml
+++ b/dep/org.argeo.slc.dep.rcp/pom.xml
@@ -52,6 +52,12 @@
                        <version>1.1.4-SNAPSHOT</version>
                        <scope>test</scope>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.support.maven</artifactId>
+                       <version>1.1.4-SNAPSHOT</version>
+                       <scope>test</scope>
+               </dependency>
        </dependencies>
        <profiles>
                <profile>

diff --git a/dep/pom.xml b/dep/pom.xml
index 872c809b40d16dbe707ca04c3b24df0eff778d02..6060a63dba0fc79fb9fe5dd031125b79ecb2f957 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -11,6 +11,7 @@
        <packaging>pom</packaging>
        <modules>
                <module>org.argeo.slc.dep.detached</module>
+               <module>org.argeo.slc.dep.minimal</module>
                <module>org.argeo.slc.dep.backend</module>
                <module>org.argeo.slc.dep.eclipse</module>
                <module>org.argeo.slc.dep.rcp</module>
@@ -32,21 +33,6 @@
                        </plugin>
                </plugins>
        </build>
-       <dependencies>
-               <!-- For target platform generation -->
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.unit</artifactId>
-                       <version>1.1.4-SNAPSHOT</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.support.maven</artifactId>
-                       <version>1.1.4-SNAPSHOT</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
        <profiles>
                <profile>
                        <id>rpmbuild</id>

diff --git a/lib/pom.xml b/lib/pom.xml
new file mode 100644 (file)
index 0000000..d75a794
--- /dev/null
+++ b/lib/pom.xml
@@ -0,0 +1,97 @@
+<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.slc</groupId>
+               <artifactId>argeo-slc</artifactId>
+               <version>1.1.4-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>lib</artifactId>
+       <packaging>pom</packaging>
+       <name>SLC Standard Libs</name>
+       <description>SLC execution modules for generic tasks</description>
+       <properties>
+               <additionalImports.slc-lib>
+                       com.jcraft.jsch;resolution:=optional,
+                       org.apache.commons.exec;resolution:=optional,
+               </additionalImports.slc-lib>
+       </properties>
+       <build>
+               <resources>
+                       <resource>
+                               <directory>.</directory>
+                               <includes>
+                                       <include>**</include>
+                               </includes>
+                               <excludes>
+                                       <exclude>.*</exclude>
+                                       <exclude>pom.xml</exclude>
+                                       <exclude>build.properties</exclude>
+                               </excludes>
+                       </resource>
+               </resources>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <SLC-ExecutionModule>default</SLC-ExecutionModule>
+                                               <!-- Minimal imports + some optional convenience imports -->
+                                               <Import-Package>
+                                                       *,
+                                                       net.sf.cglib.core,
+                                                       net.sf.cglib.proxy,
+                                                       net.sf.cglib.reflect,
+                                                       org.aopalliance.aop,
+                                                       org.argeo.slc.core.execution,
+                                                       org.argeo.slc.core.execution.tasks,
+                                                       org.argeo.slc.execution,
+                                                       org.argeo.slc.osgi,
+                                                       org.argeo.slc.test,
+                                                       org.springframework.aop,
+                                                       org.springframework.aop.framework,
+                                                       org.springframework.aop.scope,
+                                                       org.springframework.beans.factory.config,
+                                                       org.springframework.core.io,
+                                                       ${additionalImports.slc-lib}
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+                       <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>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-jar-plugin</artifactId>
+                       </plugin>
+               </plugins>
+       </build>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.dep.minimal</artifactId>
+                       <version>1.1.4-SNAPSHOT</version>
+                       <type>pom</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.dep.backend</artifactId>
+                       <version>1.1.4-SNAPSHOT</version>
+                       <type>pom</type>
+                       <optional>true</optional>
+               </dependency>
+       </dependencies>
+</project>

diff --git a/pom.xml b/pom.xml
index c22afef3e53fed2e3475a2f895f511b992a11515..1169cb4ae31ff844a288ad942808262423133999 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,7 @@
        <modules>
                <module>runtime</module>
                <module>modules</module>
+               <module>lib</module>
                <module>plugins</module>
                <module>demo</module>
                <module>dep</module>