Deactivate default log4j init

[gpl/argeo-slc.git] / org.argeo.slc / pom.xml

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index c71c706a43e3e32a172da841a47f23fd1f4e7b93..34060d27c47adbad6472d1acb3e98fd92f85147c 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -7,19 +7,13 @@
        <artifactId>argeo-slc</artifactId>
        <packaging>pom</packaging>
        <name>Argeo SLC</name>
-       <version>0.9-SNAPSHOT</version>
+       <version>0.9.3-SNAPSHOT</version>
        <description>SLC Distribution</description>
        <url>
                http://www.argeo.org/projects/slc/${project.artfactId}/${project.version}
        </url>
-       <!-- 
-               <modules>
-               <module>../org.argeo.slc.core</module>
-               <module>../org.argeo.slc.example</module>
-               </modules>
-       -->
        <properties>
-               <version.spring>2.5.4</version.spring>
+               <version.spring>2.5.5</version.spring>
                <version.spring-ws>1.5.2</version.spring-ws>
                <version.maven>2.0.9</version.maven>
                <version.ant>1.7.0</version.ant>
@@ -104,7 +98,21 @@
                                        <configuration>
                                                <contextPath>org.argeo.slc.webapp</contextPath>
                                                <stopKey>stopKey</stopKey>
-                                               <stopPort>8081</stopPort>
+                                               <stopPort>9091</stopPort>
+                                               <connectors>
+                                                       <connector
+                                                               implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                                                               <port>9090</port>
+                                                               <maxIdleTime>60000</maxIdleTime>
+                                                       </connector>
+                                               </connectors>
+                                               <systemProperties>
+                                                       <systemProperty>
+                                                               <!-- some library (JExcelAPi) include log4j config in their jar -->
+                                                               <name>log4j.defaultInitOverride</name>
+                                                               <value>true</value>
+                                                       </systemProperty>
+                                               </systemProperties>
                                        </configuration>
                                </plugin>
                        </plugins>
@@ -156,7 +164,7 @@
                        <dependency>
                                <groupId>org.dbunit</groupId>
                                <artifactId>dbunit</artifactId>
-                               <version>2.2</version>
+                               <version>2.2.3</version>
                                <exclusions>
                                        <exclusion>
                                                <groupId>junit-addons</groupId>
@@ -171,7 +179,25 @@
                        <dependency>
                                <groupId>log4j</groupId>
                                <artifactId>log4j</artifactId>
-                               <version>1.2.14</version>
+                               <version>1.2.15</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>com.sun.jmx</groupId>
+                                               <artifactId>jmxri</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               <groupId>com.sun.jdmk</groupId>
+                                               <artifactId>jmxtools</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               <groupId>javax.mail</groupId>
+                                               <artifactId>mail</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               <groupId>javax.jms</groupId>
+                                               <artifactId>jms</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>commons-logging</groupId>
@@ -183,12 +209,22 @@
                                <artifactId>hibernate</artifactId>
                                <version>3.2.6.ga</version>
                        </dependency>
+                       <dependency>
+                               <groupId>net.sf.ehcache</groupId>
+                               <artifactId>ehcache</artifactId>
+                               <version>1.4.1</version>
+                       </dependency>
 
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>spring-context</artifactId>
                                <version>${version.spring}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.springframework</groupId>
+                               <artifactId>spring-context-support</artifactId>
+                               <version>${version.spring}</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>spring-orm</artifactId>
@@ -204,6 +240,12 @@
                                <artifactId>spring-webmvc</artifactId>
                                <version>${version.spring}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.springframework</groupId>
+                               <artifactId>spring-aop</artifactId>
+                               <version>${version.spring}</version>
+                       </dependency>
+
                        <dependency>
                                <groupId>org.springframework.ws</groupId>
                                <artifactId>spring-ws-core</artifactId>
@@ -227,9 +269,9 @@
                        </dependency>
 
                        <dependency>
-                               <groupId>org.apache.commons</groupId>
+                               <groupId>commons-io</groupId>
                                <artifactId>commons-io</artifactId>
-                               <version>1.3.2</version>
+                               <version>1.4</version>
                        </dependency>
                        <dependency>
                                <groupId>commons-cli</groupId>
@@ -329,6 +371,24 @@
                                <version>${version.maven}</version>
                        </dependency>
 
+                       <dependency>
+                               <groupId>org.aspectj</groupId>
+                               <artifactId>aspectjweaver</artifactId>
+                               <version>1.6.0</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>net.sourceforge.jexcelapi</groupId>
+                               <artifactId>jxl</artifactId>
+                               <version>2.6.3</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>com.lowagie</groupId>
+                               <artifactId>itext</artifactId>
+                               <version>2.1.2</version>
+                       </dependency>
+
+
                </dependencies>
        </dependencyManagement>
        <repositories>