Reactivate SLC Lib

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

diff --git a/lib/pom.xml b/lib/pom.xml
index 4cdb7dbf1b56b6dec5db02c8779bf8bc3f836210..63378d89545baa05a7ba1096e12a76f305246a3d 100644 (file)
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -10,12 +11,12 @@
        <packaging>pom</packaging>
        <name>SLC Standard Libs</name>
        <description>SLC execution modules for generic tasks, to be used as parent pom</description>
-       <modules>
-               <module>org.argeo.slc.lib.build</module>
-               <module>org.argeo.slc.lib.jcr</module>
-               <module>org.argeo.slc.lib.repo</module>
-               <module>org.argeo.slc.lib.rpmfactory</module>
-       </modules>
+       <!-- <modules> -->
+       <!-- <module>org.argeo.slc.lib.build</module> -->
+       <!-- <module>org.argeo.slc.lib.jcr</module> -->
+       <!-- <module>org.argeo.slc.lib.repo</module> -->
+       <!-- <module>org.argeo.slc.lib.rpmfactory</module> -->
+       <!-- </modules> -->
        <properties>
                <additionalImports.slc-lib>
                        com.jcraft.jsch;resolution:=optional,
@@ -46,10 +47,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,
@@ -61,7 +61,8 @@
                                                        org.springframework.aop.scope,
                                                        org.springframework.beans.factory.config,
                                                        org.springframework.core.io,
-                                                       ${additionalImports.slc-lib}
+                                                       ${additionalImports.slc-lib},
+                                                       *
                                                </Import-Package>
                                        </instructions>
                                </configuration>

diff --git a/pom.xml b/pom.xml
index 29d384ed1c601b48124122e190e7be219bae1e23..9cef06785158630897d9f5c6569530e730a70741 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
                <module>org.argeo.slc.client.ui.dist</module>
                <module>org.argeo.slc.client.rap</module>
 
-               <!-- <module>lib</module> -->
+               <module>lib</module>
                <module>dep</module>
                <!-- <module>dist</module> -->
                <module>demo</module>