[maven-release-plugin] prepare release argeo-slc-2.1.11

[gpl/argeo-slc.git] / demo / modules / pom.xml

diff --git a/demo/modules/pom.xml b/demo/modules/pom.xml
index fb6c88f86351a4dd74d106748c2fe6d97aae54dc..22b1f79c010c8cccfe580e3936fed6315fe6652b 100644 (file)
--- a/demo/modules/pom.xml
+++ b/demo/modules/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>demo</artifactId>
-               <version>0.14.1-SNAPSHOT</version>
+               <version>2.1.11</version>
                <relativePath>..</relativePath>
        </parent>
        <groupId>org.argeo.slc.demo</groupId>
@@ -13,25 +13,18 @@
        <modules>
                <module>org.argeo.slc.demo.ant</module>
                <module>org.argeo.slc.demo.basic</module>
-               <module>org.argeo.slc.demo.det</module>
-               <module>org.argeo.slc.demo.detached</module>
-               <module>org.argeo.slc.demo.maven</module>
+               <!-- <module>org.argeo.slc.demo.det</module> -->
+               <!-- <module>org.argeo.slc.demo.detached</module> -->
+               <!-- <module>org.argeo.slc.demo.maven</module> -->
                <module>org.argeo.slc.demo.minimal</module>
        </modules>
+       <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>
@@ -39,46 +32,43 @@
                                <configuration>
                                        <instructions>
                                                <SLC-ExecutionModule>default</SLC-ExecutionModule>
-                                               <!-- Minimal imports -->
+                                               <!-- Minimal imports + some optional convenience imports -->
                                                <Import-Package>
-                                                       *,
-                                                       net.sf.cglib.core;resolution:=optional,
-                                                       net.sf.cglib.proxy;resolution:=optional,
-                                                       net.sf.cglib.reflect;resolution:=optional,
+                                                       org.springframework.cglib.proxy,
+                                                       org.springframework.cglib.core,
+                                                       org.springframework.cglib.reflect,
                                                        org.aopalliance.aop,
                                                        org.argeo.slc.core.execution,
                                                        org.argeo.slc.core.execution.tasks,
-                                                       org.argeo.slc.core.structure.tree;resolution:=optional,
                                                        org.argeo.slc.execution,
                                                        org.argeo.slc.osgi,
-                                                       org.argeo.slc.test;resolution:=optional,
-                                                       org.argeo.slc.structure;resolution:=optional,
+                                                       org.argeo.slc.test,
                                                        org.springframework.aop,
                                                        org.springframework.aop.framework,
                                                        org.springframework.aop.scope,
                                                        org.springframework.beans.factory.config,
-                                                       org.springframework.core.io,                                            
+                                                       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>2.1.11</version>
+                       <type>pom</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.dep.backend</artifactId>
+                       <version>2.1.11</version>
+                       <type>pom</type>
+                       <optional>true</optional>
+               </dependency>
+       </dependencies>
 </project>