Add logs

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

diff --git a/pom.xml b/pom.xml
index c06199e438993f3073bfb5dcab495e52523a65d8..790c29f80f2ec974aa32494eae4bfa29fe4a21df 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -274,6 +274,11 @@ limitations under the License.
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.equinox</artifactId>
                                <version>${project.version}</version>
+                       </dependency>\r
+                       <dependency>\r
+                               <groupId>org.argeo.slc.runtime</groupId>\r
+                               <artifactId>org.argeo.slc.support.jemmy</artifactId>\r
+                               <version>${project.version}</version>\r
                        </dependency>
                        <!--
                                <dependency> <groupId>org.argeo.slc.runtime</groupId>
@@ -394,6 +399,12 @@ limitations under the License.
                                <groupId>org.dbunit</groupId>
                                <artifactId>com.springsource.org.dbunit</artifactId>
                                <version>2.2.0</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
 
                        <!-- Logging -->
@@ -751,6 +762,17 @@ limitations under the License.
                                <artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
                                <version>1.2.2.osgi</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.apache.commons</groupId>
+                               <artifactId>com.springsource.org.apache.commons.fileupload</artifactId>
+                               <version>1.2.0</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
 
                        <!-- DB Drivers -->
                        <dependency>
@@ -917,13 +939,16 @@ limitations under the License.
                        <dependency>
                                <groupId>org.hibernate</groupId>
                                <artifactId>com.springsource.org.hibernate</artifactId>
-                               <version>3.2.6.ga</version>
-                               <!-- <version>3.3.1.GA</version> TODO: fix issues with logging -->
+                               <version>3.3.1.GA</version>
                                <exclusions>
                                        <exclusion>
                                                <groupId>org.apache.commons</groupId>
                                                <artifactId>com.springsource.org.apache.commons.logging</artifactId>
                                        </exclusion>
+                                       <exclusion>
+                                               <groupId>org.slf4j</groupId>
+                                               <artifactId>com.springsource.slf4j.api</artifactId>
+                                       </exclusion>
                                </exclusions>
                        </dependency>
                        <dependency>
@@ -934,7 +959,7 @@ limitations under the License.
                        <dependency>
                                <groupId>net.sourceforge.ehcache</groupId>
                                <artifactId>com.springsource.net.sf.ehcache</artifactId>
-                               <version>1.4.1</version>
+                               <version>1.6.0</version>
                                <exclusions>
                                        <exclusion>
                                                <groupId>org.apache.commons</groupId>
@@ -973,6 +998,16 @@ limitations under the License.
                                <artifactId>org.argeo.dep.osgi.activemq</artifactId>
                                <version>${version.activemq}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.argeo.dep.osgi</groupId>
+                               <artifactId>org.argeo.dep.osgi.activemq.optional</artifactId>
+                               <version>5.2.0.0001</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.dep.osgi</groupId>
+                               <artifactId>org.argeo.dep.osgi.activemq.xmpp</artifactId>
+                               <version>5.2.0.0001</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.apache.activemq</groupId>
                                <artifactId>com.springsource.org.apache.activemq.pool</artifactId>