X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;ds=inline;f=pom.xml;h=2885b4b8ab3037d9f9f01f1500558ae603f01ef6;hb=fd4a4ea32d9f23873f8b1c4f7fabcb7774522622;hp=981a892b0c8fefe1b846c3bb95996c9858b0ed87;hpb=162af365e45e54e5e8d656be276914df2005eaec;p=utils

diff --git a/pom.xml b/pom.xml
index 981a892b..2885b4b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,7 @@
     <url>http://wamblee.org</url>
     <modules>
         <module>support</module>
+        <module>system</module>
         <module>hibernate-jpa</module>
         <module>security</module>
         <module>socketproxy</module>
@@ -22,84 +23,77 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.4</version>
-            <scope>test</scope> 
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.dbunit</groupId>
             <artifactId>dbunit</artifactId>
-            <version>2.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>jmock</groupId>
-            <artifactId>jmock-cglib</artifactId>
-            <version>1.1.0</version>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbyclient</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbynet</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>cglib</groupId>
-                    <artifactId>cglib-full</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
+        
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>1.8.0</version> 
+            <scope>test</scope>
+        </dependency>
+
+        <!-- dependency>
+          <groupId>org.testng</groupId>
+          <artifactId>testng</artifactId>
+          <version>5.7</version>
+          <scope>test</scope>
+          <classifier>jdk15</classifier>
+        </dependency -->
     </dependencies>
 
     <dependencyManagement>
         <dependencies>
+            
             <dependency>
-                <groupId>org.wamblee</groupId>
-                <artifactId>wamblee-support</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wamblee</groupId>
-                <artifactId>wamblee-support</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
+                <groupId>org.dbunit</groupId>
+                <artifactId>dbunit</artifactId>
+                <version>2.4.7</version>
             </dependency>
             <dependency>
-                <groupId>org.wamblee</groupId>
-                <artifactId>wamblee-hibernate-jpa</artifactId>
-                <version>${project.version}</version>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.5.11</version>
             </dependency>
             <dependency>
-                <groupId>org.wamblee</groupId>
-                <artifactId>wamblee-hibernate-jpa</artifactId>
-                <version>${project.version}</version>
-                <type>test-jar</type>
-            </dependency>
-            <dependency>
-                <groupId>org.wamblee</groupId>
-                <artifactId>wamblee-socketproxy</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wamblee</groupId>
-                <artifactId>wamblee-socketproxy</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wamblee</groupId>
-                <artifactId>wamblee-crawler</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wamblee</groupId>
-                <artifactId>wamblee-crawler</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wamblee</groupId>
-                <artifactId>wamblee-crawler-basic</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wamblee</groupId>
-                <artifactId>wamblee-crawler-basic</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-jdk14</artifactId>
+                <version>1.5.11</version>
             </dependency>
 
             <dependency>
@@ -128,22 +122,22 @@
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
-                <version>3.1.14</version>
+                <version>5.1.12</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derby</artifactId>
-                <version>10.3.2.1</version>
+                <version>10.5.3.0_1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derbyclient</artifactId>
-                <version>10.3.2.1</version>
+                <version>10.5.3.0_1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derbynet</artifactId>
-                <version>10.3.2.1</version>
+                <version>10.5.3.0_1</version>
             </dependency>
             <dependency>
                 <groupId>quartz</groupId>
@@ -175,37 +169,37 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-beans</artifactId>
-                <version>${springversion}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-web</artifactId>
-                <version>${springversion}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-jms</artifactId>
-                <version>${springversion}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-context</artifactId>
-                <version>${springversion}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-hibernate3</artifactId>
-                <version>${springversion}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-jpa</artifactId>
-                <version>${springversion}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-aop</artifactId>
-                <version>${springversion}</version>
+                <version>${spring.version}</version>
             </dependency>
 
             <!-- should be possible to remove the dependence on log4j -->
@@ -290,13 +284,32 @@
                 <artifactId>commons-codec</artifactId>
                 <version>1.3</version>
             </dependency>
-
+            
+            <dependency>
+                <groupId>commons-dbcp</groupId>
+                <artifactId>commons-dbcp</artifactId>
+                <version>1.4</version>
+            </dependency>
+            <dependency>
+                <groupId>toplink.essentials</groupId>
+                <artifactId>toplink-essentials</artifactId>
+                <version>2.0-36</version>
+            </dependency>
+            
 
         </dependencies>
     </dependencyManagement>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jalopy-maven-plugin</artifactId>
+                <configuration>
+                    <fileFormat>UNIX</fileFormat>
+                    <convention>org.wamblee.jalopy.xml</convention>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -313,6 +326,7 @@
                     <includes>
                         <include>**/*Test.java</include>
                     </includes>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
                 </configuration>
             </plugin>
 
@@ -344,8 +358,17 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <instrumentation>
+                        <excludes>
+                            <exclude>org/wamblee/crawler/kiss/**/*.class</exclude>
+                            <exclude>org/wamblee/mythtv/**/*.class</exclude>
+                        </excludes>
+                    </instrumentation>
+                </configuration>
             </plugin>
 
+
         </plugins>
 
     </build>
@@ -394,6 +417,12 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
+                <configuration>
+                    <formats>
+                        <format>xml</format>
+                        <format>html</format>
+                    </formats>
+                </configuration>
             </plugin>
 
             <!-- checkstyle -->
@@ -431,7 +460,8 @@
     </repositories>
 
     <properties>
-        <springversion>2.0.8</springversion>
+        <spring.version>2.0.8</spring.version>
+        <jmock.version>2.4.0</jmock.version>
     </properties>
 
 </project>