merge from develop

Core/build.xml

@@ -185,6 +185,9 @@
         <copy file="${thirdparty.dir}/LICENSE-2.0.txt" todir="${ext.dir}" />        
         <!-- fetch all the dependencies from Ivy and stick them in the right places -->
         <ivy:resolve log="quiet"/>
+	    
+        <!-- Make a report that lists out the dependencies that our JARs have -->	
+        <ivy:report todir='${basedir}/build/ivy-reports' graph='true' xml='false'/>
         <ivy:retrieve conf="core" pattern="${ext.dir}/[artifact]-[revision](-[classifier]).[ext]" />
     </target>
 

CoreLibs/build.xml

@@ -37,7 +37,10 @@
     <target name="get-deps" description="retrieve dependencies using ivy" depends="init-ivy,build-native-libs,get-thirdparty-dependencies">
         <ivy:settings file="ivysettings.xml" />
         <ivy:resolve log="quiet"/>
-        <ivy:retrieve pattern="${basedir}/release/modules/ext/[artifact]-[revision](-[classifier]).[ext]" />    
+        
+        <!-- Make a report that lists out the dependencies that our JARs have -->	
+        <ivy:report todir='${basedir}/build/ivy-reports' graph='true' xml='false'/>
+        <ivy:retrieve pattern="${basedir}/release/modules/ext/[artifact]-[revision](-[classifier]).[ext]" />
     </target>
     
     <target name="init" depends="get-deps,harness.init"/>

KeywordSearch/ivy.xml

@@ -34,7 +34,7 @@
         <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-deploy" rev="11.0.8"/>
         <dependency conf="servlet->default" org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016"/>
 
-
+        <!-- logging -->
         <dependency conf="slf4j-libs->default" org="org.slf4j" name="slf4j-log4j12" rev="1.7.36"/>
         <dependency conf="slf4j-libs->default" org="org.slf4j" name="jcl-over-slf4j" rev="1.7.36"/>
         <dependency conf="slf4j-libs->default" org="org.slf4j" name="jul-to-slf4j" rev="1.7.36"/> 
@@ -49,7 +49,7 @@
         <override org="org.apache.logging.log4j" module="log4j-slf4j-impl" rev="2.17.2"/>
         <override org="org.apache.logging.log4j" module="log4j-web" rev="2.17.2"/>
         <override org="org.slf4j" module="slf4j-api" rev="1.7.36"/>
-        
+
         <override org="org.apache.zookeeper" module="zookeeper" rev="3.8.0"/>
         <override org="org.apache.zookeeper" module="zookeeper-jute" rev="3.8.0"/>
         <override org="com.google.code.gson" module="gson" rev="2.9.0"/>