baseline uplifts

[utils] / pom.xml

diff --git a/pom.xml b/pom.xml
index 15b3c8073fd1752442c2d8a9b32b56bc7d0ae10f..2885b4b8ab3037d9f9f01f1500558ae603f01ef6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,24 +23,48 @@
             <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>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>2.3</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.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <version>2.3</version>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <scope>test</scope>
+        </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>
 
@@ -55,6 +79,22 @@
 
     <dependencyManagement>
         <dependencies>
+            
+            <dependency>
+                <groupId>org.dbunit</groupId>
+                <artifactId>dbunit</artifactId>
+                <version>2.4.7</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.5.11</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-jdk14</artifactId>
+                <version>1.5.11</version>
+            </dependency>
 
             <dependency>
                 <groupId>javax.persistence</groupId>
@@ -82,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>
@@ -244,7 +284,18 @@
                 <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>
@@ -252,12 +303,12 @@
     <build>
         <plugins>
             <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>jalopy-maven-plugin</artifactId>
-              <configuration>
-                  <fileFormat>UNIX</fileFormat>
-                  <convention>org.wamblee.jalopy.xml</convention>
-              </configuration>
+                <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>
@@ -296,7 +347,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
@@ -310,16 +361,16 @@
                 <configuration>
                     <instrumentation>
                         <excludes>
-                          <exclude>org/wamblee/crawler/kiss/**/*.class</exclude>
-                          <exclude>org/wamblee/mythtv/**/*.class</exclude>
+                            <exclude>org/wamblee/crawler/kiss/**/*.class</exclude>
+                            <exclude>org/wamblee/mythtv/**/*.class</exclude>
                         </excludes>
                     </instrumentation>
                 </configuration>
             </plugin>
-            
+
 
         </plugins>
-        
+
     </build>
 
     <reporting>
@@ -367,10 +418,10 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
                 <configuration>
-                  <formats>
-                    <format>xml</format>
-                    <format>html</format>
-                  </formats>
+                    <formats>
+                        <format>xml</format>
+                        <format>html</format>
+                    </formats>
                 </configuration>
             </plugin>