You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2016/03/18 14:36:02 UTC
directory-fortress-core git commit: sync ivy/ant versions w/ maven
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 61b707902 -> 2bb919aa8
sync ivy/ant versions w/ maven
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/2bb919aa
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/2bb919aa
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/2bb919aa
Branch: refs/heads/master
Commit: 2bb919aa8a78dc5988dffe29dabbd4f6fa16a5a1
Parents: 61b7079
Author: Shawn McKinney <sm...@apache.org>
Authored: Fri Mar 18 01:01:58 2016 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Fri Mar 18 01:01:58 2016 -0500
----------------------------------------------------------------------
build.xml | 12 ++++++------
ivy.xml | 18 ++++++++----------
2 files changed, 14 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/2bb919aa/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9e59f39..9b8f746 100644
--- a/build.xml
+++ b/build.xml
@@ -143,11 +143,11 @@
<property name="commons-collections.jar" value="${lib.dir}/commons-collections-3.2.1.jar"/>
<property name="commons-logging.jar" value="${lib.dir}/commons-logging-1.1.1.jar"/>
<property name="commons-io.jar" value="${lib.dir}/commons-io-2.4.jar"/>
- <property name="httpclient.jar" value="${lib.dir}/httpclient-4.5.1.jar"/>
- <property name="httpcore.jar" value="${lib.dir}/httpcore-4.4.3.jar"/>
- <property name="cxf-common-utilities.jar" value="${lib.dir}/cxf-api-2.7.17.jar"/>
- <property name="javax.ws.rs-api.jar" value="${lib.dir}/javax.ws.rs-api-2.0.1.jar"/>
<property name="commons-codec.jar" value="${lib.dir}/commons-codec-1.10.jar"/>
+ <property name="httpclient.jar" value="${lib.dir}/httpclient-4.5.2.jar"/>
+ <property name="httpcore.jar" value="${lib.dir}/httpcore-4.4.4.jar"/>
+ <property name="cxf-common-utilities.jar" value="${lib.dir}/cxf-api-2.7.18.jar"/>
+ <property name="javax.ws.rs-api.jar" value="${lib.dir}/javax.ws.rs-api-2.0.1.jar"/>
<property name="jgraph.jar" value="${lib.dir}/jgrapht-core-0.9.1.jar"/>
<property name="log4j.jar" value="${lib.dir}/log4j-1.2.17.jar"/>
<property name="junit.jar" value="${lib.dir}/junit-4.12.jar"/>
@@ -164,8 +164,8 @@
<property name="slf4j-log4j.jar" value="${lib.dir}/slf4j-log4j12-1.7.12.jar"/>
<property name="apacheJMeter_core.jar" value="${lib.dir}/ApacheJMeter_core-2.11.jar"/>
<property name="apacheJMeter_java.jar" value="${lib.dir}/ApacheJMeter_java-2.11.jar"/>
- <property name="apacheds-all.jar" value="${lib.dir}/apacheds-all-2.0.0-M19.jar"/>
- <property name="apacheds-api-all.jar" value="${lib.dir}/api-all-1.0.0-M31.jar"/>
+ <property name="apacheds-all.jar" value="${lib.dir}/apacheds-all-2.0.0-M21.jar"/>
+ <property name="apacheds-api-all.jar" value="${lib.dir}/api-all-1.0.0-M33.jar"/>
<property name="mina-core.jar" value="${lib.dir}/mina-core-2.0.7.jar"/>
<property name="opencsv.jar" value="${lib.dir}/opencsv-2.3.jar"/>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/2bb919aa/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index 3430e1b..b90c4e5 100755
--- a/ivy.xml
+++ b/ivy.xml
@@ -22,12 +22,10 @@
xmlns:e="http://ant.apache.org/ivy/extra">
<info organisation="org.apache" module="fortress-core"/>
-
<dependencies>
<!-- Fortress core is dependent on these libs: -->
- <dependency org="commons-lang" name="commons-lang" rev="2.4" conf="default->master"/>
- <dependency org="commons-configuration" name="commons-configuration" rev="1.10" conf="default->master"/>
<dependency org="commons-lang" name="commons-lang" rev="2.6" conf="default->master"/>
+ <dependency org="commons-configuration" name="commons-configuration" rev="1.10" conf="default->master"/>
<dependency org="commons-collections" name="commons-collections" rev="3.2.1" conf="default->master"/>
<dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="default->master"/>
<dependency org="commons-codec" name="commons-codec" rev="1.10" conf="default->master"/>
@@ -39,19 +37,19 @@
<dependency org="org.jgrapht" name="jgrapht-core" rev="0.9.1" conf="default->master"/>
<dependency org="com.sun.xml.bind" name="jaxb-xjc" rev="2.2.4-1" conf="default->master"/>
<dependency org="com.sun.xml.bind" name="jaxb-impl" rev="2.2.4-1" conf="default->master"/>
- <dependency org="javax.xml.bind" name="jaxb-api" rev="2.2.6" conf="default->master"/>
- <dependency org="org.apache.httpcomponents" name="httpclient" rev="4.5.1" conf="default->master"/>
- <dependency org="org.apache.httpcomponents" name="httpcore" rev="4.4.3" conf="default->master"/>
+ <dependency org="javax.xml.bind" name="jaxb-api" rev="2.2.11" conf="default->master"/>
+ <dependency org="org.apache.httpcomponents" name="httpclient" rev="4.5.2" conf="default->master"/>
+ <dependency org="org.apache.httpcomponents" name="httpcore" rev="4.4.4" conf="default->master"/>
<dependency org="org.codehaus.jackson" name="jackson-jaxrs" rev="1.9.0" conf="default->master"/>
<dependency org="javax" name="javaee-api" rev="7.0" conf="default->master"/>
- <dependency org="org.apache.cxf" name="cxf-api" rev="2.7.17" conf="default->master"/>
+ <dependency org="org.apache.cxf" name="cxf-api" rev="2.7.18" conf="default->master"/>
<dependency org="javax.ws.rs" name="javax.ws.rs-api" rev="2.0.1" conf="default->master"/>
- <dependency org="net.sf.ehcache" name="ehcache-core" rev="2.6.10" conf="default->master"/>
+ <dependency org="net.sf.ehcache" name="ehcache-core" rev="2.6.11" conf="default->master"/>
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.12" conf="default->master"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.12" conf="default->master"/>
<dependency org="org.slf4j" name="slf4j-jcl" rev="1.7.12" conf="default->master"/>
- <dependency org="org.apache.directory.api" name="api-all" rev="1.0.0-M31" conf="default->master"/>
- <dependency org="org.apache.directory.server" name="apacheds-all" rev="2.0.0-M19" conf="default->master"/>
+ <dependency org="org.apache.directory.api" name="api-all" rev="1.0.0-M33" conf="default->master"/>
+ <dependency org="org.apache.directory.server" name="apacheds-all" rev="2.0.0-M21" conf="default->master"/>
<dependency org="net.sf.opencsv" name="opencsv" rev="2.3" conf="default->master" />
<dependency org="org.apache.jmeter" name="ApacheJMeter_core" rev="2.11" conf="default->master" />
<dependency org="org.apache.jmeter" name="ApacheJMeter_java" rev="2.11" conf="default->master" />