Author: solomax
Date: Tue Oct 20 06:42:44 2015
New Revision: 1709519
URL: http://svn.apache.org/viewvc?rev=1709519&view=rev
Log:
[OPENMEETINGS-1259] threetenbp, joda-time versions are updated, test libraries
are removed from release
Modified:
openmeetings/branches/3.0.x/build.xml
openmeetings/branches/3.0.x/ivy.xml
Modified: openmeetings/branches/3.0.x/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/build.xml?rev=1709519&r1=1709518&r2=1709519&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/build.xml (original)
+++ openmeetings/branches/3.0.x/build.xml Tue Oct 20 06:42:44 2015
@@ -1312,6 +1312,7 @@
<antcall target="-retrieve" inheritAll="true"
inheritRefs="true">
<param name="ivy.conf.name" value="junit" />
<param name="ivy.lib.location" value="${junit.lib.dir}"
/>
+ <param name="ivy.transitive" value="true" />
</antcall>
</target>
<!-- Check for rat libraries -->
Modified: openmeetings/branches/3.0.x/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivy.xml?rev=1709519&r1=1709518&r2=1709519&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivy.xml (original)
+++ openmeetings/branches/3.0.x/ivy.xml Tue Oct 20 06:42:44 2015
@@ -248,7 +248,7 @@
<dependency org="org.apache.wicket" name="wicket-datetime"
rev="7.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="joda-time" name="joda-time" rev="2.3"
conf="openmeetings->*" transitive="false">
+ <dependency org="joda-time" name="joda-time" rev="2.7"
conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="org.apache.wicket" name="wicket-devutils"
rev="7.0.0" conf="openmeetings->*" transitive="false">
@@ -273,7 +273,7 @@
<dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-kendo-ui" rev="7.0.2" conf="openmeetings->*" transitive="false"/>
<dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-kendo-ui-theme-default" rev="7.0.2" conf="openmeetings->*"
transitive="false"/>
<dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-kendo-ui-culture" rev="7.0.2" conf="openmeetings->*"
transitive="false"/>
- <dependency org="org.threeten" name="threetenbp" rev="1.2"
conf="openmeetings->*" transitive="false"/>
+ <dependency org="org.threeten" name="threetenbp" rev="1.3.1"
conf="openmeetings->*" transitive="false"/>
<dependency org="ro.fortsoft.wicket.dashboard"
name="wicket-dashboard-core" rev="0.12.1+wicket-7" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
@@ -302,10 +302,6 @@
<dependency org="org.asteriskjava" name="asterisk-java"
rev="1.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <!-- Selenium -->
- <dependency org="org.seleniumhq.selenium" name="selenium-java"
conf="openmeetings->*" rev="2.42.2" >
- <include type="jar" />
- </dependency>
<dependency org="org.apache.directory.api" name="api-all"
rev="1.0.0-M31" conf="openmeetings->*" >
<include type="jar" />
</dependency>
@@ -360,12 +356,18 @@
<!-- END OF OPENMEETINGS -->
<!-- START OF JUNIT -->
+ <dependency org="junit" name="junit" rev="4.12" conf="junit->*"
transitive="false">
+ <include type="jar" />
+ </dependency>
<dependency org="org.springframework" name="spring-test"
rev="4.1.7.RELEASE" conf="junit->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="ant-contrib" name="ant-contrib" rev="1.0b3"
conf="junit->*" transitive="false">
<include type="jar" />
</dependency>
+ <dependency org="org.seleniumhq.selenium" name="selenium-java"
conf="junit->*" rev="2.48.2" transitive="true">
+ <include type="jar" />
+ </dependency>
<!-- END OF JUNIT -->
<!-- START OF RAT -->
