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

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

diff --git a/demo/modules/pom.xml b/demo/modules/pom.xml
index 07f6856ab3252fe3055f2a8e1a400d3b0c303d98..92f31916469103b06a5b6c56284ecceadfe13de3 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>1.1.9</version>
+               <version>2.1.9</version>
                <relativePath>..</relativePath>
        </parent>
        <groupId>org.argeo.slc.demo</groupId>
@@ -13,9 +13,9 @@
        <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>
@@ -25,20 +25,6 @@
                </additionalImports.slc-lib>
        </properties>
        <build>
-               <resources>
-                       <resource>
-                               <directory>.</directory>
-                               <includes>
-                                       <include>**</include>
-                               </includes>
-                               <excludes>
-                                       <exclude>.*</exclude>
-                                       <exclude>.*/**</exclude>
-                                       <exclude>pom.xml</exclude>
-                                       <exclude>build.properties</exclude>
-                               </excludes>
-                       </resource>
-               </resources>
                <plugins>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
@@ -48,10 +34,9 @@
                                                <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.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,
@@ -63,7 +48,8 @@
                                                        org.springframework.aop.scope,
                                                        org.springframework.beans.factory.config,
                                                        org.springframework.core.io,
-                                                       ${additionalImports.slc-lib}
+                                                       ${additionalImports.slc-lib},
+                                                       *
                                                </Import-Package>
                                        </instructions>
                                </configuration>
@@ -74,13 +60,13 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.dep.minimal</artifactId>
-                       <version>1.1.9</version>
+                       <version>2.1.9</version>
                        <type>pom</type>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.dep.backend</artifactId>
-                       <version>1.1.9</version>
+                       <version>2.1.9</version>
                        <type>pom</type>
                        <optional>true</optional>
                </dependency>