From 1eee8af77481429c64b60c1d21b276d43e704547 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 28 Mar 2014 09:31:55 +0000
Subject: [PATCH] ivy.xml: Updated several libs versions.
---
opendj-sdk/opendj3-server-dev/build.xml | 2 +-
opendj-sdk/opendj3-server-dev/ivy.xml | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opendj3-server-dev/build.xml b/opendj-sdk/opendj3-server-dev/build.xml
index b32cb07..2b59d5f 100644
--- a/opendj-sdk/opendj3-server-dev/build.xml
+++ b/opendj-sdk/opendj3-server-dev/build.xml
@@ -2875,7 +2875,7 @@
<firstmatchmapper>
<regexpmapper from="(.*/(source|javadoc)/.*)" to="\1"/>
<!-- Separate test and compile jars ala Maven -->
- <regexpmapper from="(.*)/(jar)/(.*(?:assertj-core|hamcrest-core|mockito-core|objenesis)\.jar)" to="\1/test/\3"/>
+ <regexpmapper from="(.*)/(jar|bundle)/(.*(?:assertj-core|hamcrest-core|mockito-core|objenesis)\.jar)" to="\1/test/\3"/>
<regexpmapper from="(.*)/(jar|bundle)/(.*)" to="\1/compile/\3"/>
</firstmatchmapper>
</ivy:retrieve>
diff --git a/opendj-sdk/opendj3-server-dev/ivy.xml b/opendj-sdk/opendj3-server-dev/ivy.xml
index 3bcf31e..4ea4e93 100644
--- a/opendj-sdk/opendj3-server-dev/ivy.xml
+++ b/opendj-sdk/opendj3-server-dev/ivy.xml
@@ -26,12 +26,12 @@
! -->
<!-- Using entities prevent constantly declaring the same versions -->
<!DOCTYPE ivy-module [
- <!ENTITY grizzly.version "2.3.6">
+ <!ENTITY grizzly.version "2.3.11">
<!ENTITY opendj.sdk.version "3.0.0-SNAPSHOT">
<!ENTITY i18n.version "1.4.2-SNAPSHOT">
<!ENTITY crest.version "2.1.0-SNAPSHOT">
- <!ENTITY jackson.version "1.9.2">
- <!ENTITY slf4j.version "1.7.5">
+ <!ENTITY jackson.version "1.9.13">
+ <!ENTITY slf4j.version "1.7.6">
]>
<ivy-module version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -46,7 +46,7 @@
<dependencies>
<!-- compile + runtime libs -->
- <dependency org="javax.mail" name="mail" rev="1.4.5" />
+ <dependency org="javax.mail" name="mail" rev="1.4.7" />
<!-- subsequent versions are not compatible with java 6, so force to use this version only -->
<dependency org="javax.servlet" name="javax.servlet-api" rev="[3.1-b02]" />
<dependency org="com.sleepycat" name="je" rev="5.0.103" />
@@ -64,7 +64,7 @@
<!-- Test libs -->
<!--dependency org="org.testng" name="testng" rev="6.8.1" /-->
- <dependency org="org.assertj" name="assertj-core" rev="1.0.0" />
+ <dependency org="org.assertj" name="assertj-core" rev="1.6.0" />
<dependency org="org.mockito" name="mockito-core" rev="1.9.5" />
<!-- Force download of the source jars -->
--
Gitblit v1.10.0