git://wamblee.org
/
utils
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
791ec55
)
baseline uplifts
author
erik
<erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Sat, 3 Apr 2010 18:56:59 +0000
(18:56 +0000)
committer
erik
<erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Sat, 3 Apr 2010 18:56:59 +0000
(18:56 +0000)
trunk/pom.xml
patch
|
blob
|
history
diff --git
a/trunk/pom.xml
b/trunk/pom.xml
index 659fb8f0055d081a8517939b53ee4f1006a31072..2885b4b8ab3037d9f9f01f1500558ae603f01ef6 100644
(file)
--- a/
trunk/pom.xml
+++ b/
trunk/pom.xml
@@
-28,7
+28,6
@@
<dependency>
<groupId>org.dbunit</groupId>
<artifactId>dbunit</artifactId>
<dependency>
<groupId>org.dbunit</groupId>
<artifactId>dbunit</artifactId>
- <version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
@@
-46,6
+45,17
@@
<artifactId>derbynet</artifactId>
<scope>test</scope>
</dependency>
<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>
+ </dependency>
+
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
@@
-53,8
+63,8
@@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-
core
</artifactId>
- <version>1.
3
</version>
+ <artifactId>mockito-
all
</artifactId>
+ <version>1.
8.0
</version>
<scope>test</scope>
</dependency>
<scope>test</scope>
</dependency>
@@
-69,6
+79,22
@@
<dependencyManagement>
<dependencies>
<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>
<dependency>
<groupId>javax.persistence</groupId>
@@
-96,22
+122,22
@@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<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>
</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>
</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>
</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>
</dependency>
<dependency>
<groupId>quartz</groupId>
@@
-258,7
+284,18
@@
<artifactId>commons-codec</artifactId>
<version>1.3</version>
</dependency>
<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>
</dependencies>
</dependencyManagement>