Author: solomax
Date: Mon Aug 25 04:44:43 2014
New Revision: 1620255
URL: http://svn.apache.org/r1620255
Log:
[OPENMEETINGS-980] library versions were updated to latest releases
Modified:
openmeetings/branches/3.0.x/build.properties
openmeetings/branches/3.0.x/build.xml
openmeetings/branches/3.0.x/ivy.xml
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/branches/3.0.x/build.properties
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/build.properties?rev=1620255&r1=1620254&r2=1620255&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/build.properties (original)
+++ openmeetings/branches/3.0.x/build.properties Mon Aug 25 04:44:43 2014
@@ -12,7 +12,7 @@
project.version=3.0.3
project.status=SNAPSHOT
project.distname=openmeetings
-ivy.install.version=2.3.0
+ivy.install.version=2.4.0-rc1
maven.version=3.2.2
red5.server.version=1.0.3-RELEASE
red5.client.version=1.0.3-RELEASE
@@ -22,3 +22,4 @@ backup.file.list=backup_v_1_4_rc1_r3326.
db=derby
screensharing.keystore.password=secret
screensharing.keystore.alias=screen
+rtmp.max.time=5000
Modified: openmeetings/branches/3.0.x/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/build.xml?rev=1620255&r1=1620254&r2=1620255&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/build.xml (original)
+++ openmeetings/branches/3.0.x/build.xml Mon Aug 25 04:44:43 2014
@@ -1203,7 +1203,7 @@
<copy
file="${red5.server.dir}/src/main/server/conf/red5.properties"
todir="${red5.lib}/conf" overwrite="true" force="true">
<filterchain>
<tokenfilter>
- <replaceregex pattern="^[
\t]*rtmp.max_handling_time[ \t]*=.*$" replace="rtmp.max_handling_time=2000"/>
+ <replaceregex pattern="^[
\t]*rtmp.max_handling_time[ \t]*=.*$"
replace="rtmp.max_handling_time=${rtmp.max.time}"/>
</tokenfilter>
</filterchain>
</copy>
Modified: openmeetings/branches/3.0.x/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivy.xml?rev=1620255&r1=1620254&r2=1620255&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivy.xml (original)
+++ openmeetings/branches/3.0.x/ivy.xml Mon Aug 25 04:44:43 2014
@@ -70,7 +70,7 @@
<dependency org="org.springframework"
name="spring-context-support" rev="4.0.6.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <!-- include type="bundle" / FIXME unable to get openjpa
without sources -->
+ <!-- include type="bundle" / FIXME unable to get geronimo-jpa
without sources -->
<dependency org="org.apache.geronimo.specs"
name="geronimo-jpa_2.0_spec" rev="1.1" conf="mainlib.ext->*"
transitive="false"/>
<!-- END OF mainlib -->
@@ -171,13 +171,13 @@
<dependency org="xml-apis" name="xml-apis-ext" rev="1.3.04"
conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.derby" name="derby" rev="10.10.1.1"
conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.derby" name="derby" rev="10.10.2.0"
conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.derby" name="derbyclient"
rev="10.10.1.1" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.derby" name="derbyclient"
rev="10.10.2.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.derby" name="derbynet"
rev="10.10.1.1" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.derby" name="derbynet"
rev="10.10.2.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="org.postgresql" name="postgresql"
rev="9.3-1102-jdbc41" conf="openmeetings->*" transitive="false">
@@ -211,9 +211,6 @@
<dependency org="commons-transaction"
name="commons-transaction" rev="1.2" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="net.sourceforge.serp" name="serp" rev="1.13.1"
conf="openmeetings->*" transitive="false">
- <include type="jar" />
- </dependency>
<dependency org="commons-dbcp" name="commons-dbcp" rev="1.4"
conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
@@ -292,7 +289,7 @@
<dependency org="org.wicketstuff" name="wicketstuff-html5"
rev="6.16.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="com.vaynberg.wicket.select2"
name="wicket-select2" rev="2.2.2" conf="openmeetings->*" transitive="false">
+ <dependency org="com.vaynberg.wicket.select2"
name="wicket-select2" rev="2.2.3" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
@@ -312,17 +309,38 @@
<include type="jar" />
</dependency>
<!-- Selenium -->
- <dependency org="org.seleniumhq.selenium" name="selenium-java"
conf="openmeetings->*" rev="2.35.0" >
+ <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-M23" conf="openmeetings->*" >
<include type="jar" />
</dependency>
+ <!-- BEGIN openjpa -->
+ <dependency org="net.sourceforge.serp" name="serp" rev="1.14.1"
conf="openmeetings->*" transitive="false" >
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.xbean" name="xbean-asm4-shaded"
rev="3.14" conf="openmeetings->*" transitive="false" />
+ <dependency org="org.apache.openjpa" name="openjpa-kernel"
rev="2.3.0" conf="openmeetings->*" transitive="false" >
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.openjpa" name="openjpa-lib"
rev="2.3.0" conf="openmeetings->*" transitive="false" >
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.openjpa" name="openjpa-persistence"
rev="2.3.0" conf="openmeetings->*" transitive="false" >
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.openjpa"
name="openjpa-persistence-jdbc" rev="2.3.0" conf="openmeetings->*"
transitive="false" >
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.openjpa" name="openjpa-jdbc"
rev="2.3.0" conf="openmeetings->*" transitive="false" >
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.openjpa" name="openjpa" rev="2.3.0"
conf="openmeetings->*" transitive="false" >
+ <include type="jar" />
+ </dependency>
+ <!-- END openjpa -->
- <!-- include type="bundle" / FIXME unable to get openjpa
without sources -->
<dependency org="org.mnode.ical4j" name="ical4j" rev="1.0.5"
conf="openmeetings.ext->*" transitive="false"/>
- <dependency org="org.apache.openjpa" name="openjpa" rev="2.2.2"
conf="openmeetings.ext->*" transitive="false"/>
- <dependency org="commons-lang" name="commons-lang" rev="2.6"
conf="openmeetings.ext->*" transitive="false"/> <!-- required by PCEnchancer -->
<dependency org="org.apache.ws.commons.axiom" name="axiom-impl"
rev="1.2.14" conf="openmeetings.axis2->*" transitive="true">
<exclude name='commons-io' />
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1620255&r1=1620254&r2=1620255&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Mon Aug 25 04:44:43 2014
@@ -49,7 +49,7 @@
<commons-transaction.version>1.2</commons-transaction.version>
<ical4j.version>1.0.5.2</ical4j.version>
<cxf.version>3.0.0</cxf.version>
- <selenium.version>2.41.0</selenium.version>
+ <selenium.version>2.42.2</selenium.version>
<red5-client.version>1.0.3-RELEASE</red5-client.version>
<simple-xml.version>2.7.1</simple-xml.version>
<jettison.version>1.3.5</jettison.version>
