You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/12/27 19:50:19 UTC
svn commit: r1648090 - in /openmeetings/branches/3.0.x: .classpath LICENSE
build.properties build.xml ivy.xml
Author: solomax
Date: Sat Dec 27 18:50:18 2014
New Revision: 1648090
URL: http://svn.apache.org/r1648090
Log:
[OPENMEETINGS-1082] library versions are updated: ivy, jgit, spring, red5
Modified:
openmeetings/branches/3.0.x/.classpath
openmeetings/branches/3.0.x/LICENSE
openmeetings/branches/3.0.x/build.properties
openmeetings/branches/3.0.x/build.xml
openmeetings/branches/3.0.x/ivy.xml
Modified: openmeetings/branches/3.0.x/.classpath
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/.classpath?rev=1648090&r1=1648089&r2=1648090&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/.classpath (original)
+++ openmeetings/branches/3.0.x/.classpath Sat Dec 27 18:50:18 2014
@@ -36,32 +36,32 @@
</classpathentry>
<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=Openmeetings+3.0.x&ivyXmlPath=ivy.xml&confs=*&ivySettingsPath=%24%7Bworkspace_loc%3AOpenmeetings+3.0.x%2Fivysettings.xml%7D&loadSettingsOnDemand=false&propertyFiles="/>
<classpathentry kind="lib" path="build/lib/java_16_tools.jar"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/red5-io-1.0.4-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/red5-io-1.0.4-RELEASE.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/red5-server.jar" sourcepath="build/red5/server/src/main/java"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/slf4j-api-1.7.7.jar"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-core-4.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-beans-4.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/mina-core-2.0.7.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/red5-server-common-1.0.4-RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/slf4j-api-1.7.9.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-core-4.0.8.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-beans-4.0.8.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/mina-core-2.0.8.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/lib/quartz-2.1.7.jar"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/log4j-over-slf4j-1.7.7.jar"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/commons-collections-20040616.jar"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-web-4.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/commons-beanutils-1.8.3.jar"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/commons-lang3-3.1.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/log4j-over-slf4j-1.7.9.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/commons-collections-3.2.1.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-web-4.0.8.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/commons-beanutils-1.9.2.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/commons-lang3-3.3.2.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/lib/logback-core-1.1.2.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/lib/logback-classic-1.1.2.jar"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-expression-4.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-context-4.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-context-support-4.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-expression-4.0.8.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-context-4.0.8.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-context-support-4.0.8.RELEASE.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/lib/aopalliance-1.0.jar"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-aop-4.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-test-4.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-aop-4.0.8.RELEASE.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/lib/commons-pool-1.5.6.jar"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/ehcache-core-2.5.0.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/ehcache-core-2.6.9.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/plugins/tomcat-embed-core.jar"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/bcprov-jdk15on-1.50.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/bcprov-jdk15on-1.51.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/lib/cglib-nodep-2.2.2.jar"/>
- <classpathentry kind="lib" path="build/red5/client/dist/red5-client-jar-1.0.3-RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/client/dist/red5-client-jar-1.0.4-RELEASE.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="owner.project.facets" value="java"/>
Modified: openmeetings/branches/3.0.x/LICENSE
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/LICENSE?rev=1648090&r1=1648089&r2=1648090&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/LICENSE (original)
+++ openmeetings/branches/3.0.x/LICENSE Sat Dec 27 18:50:18 2014
@@ -413,48 +413,47 @@ webapps/openmeetings/WEB-INF/lib/xmlrpc-
webapps/openmeetings/WEB-INF/lib/XmlSchema-bundle-1.4.8-SNAPSHOT.jar
webapps/openmeetings/screensharing/commons-beanutils-1.8.3.jar
-webapps/openmeetings/screensharing/commons-codec-1.6.jar
-webapps/openmeetings/screensharing/commons-collections-20040616.jar
+webapps/openmeetings/screensharing/commons-codec-1.9.jar
+webapps/openmeetings/screensharing/commons-collections-3.2.1.jar
webapps/openmeetings/screensharing/ehcache-core-2.5.0.jar
webapps/openmeetings/screensharing/httpclient-4.2.1.jar
webapps/openmeetings/screensharing/httpcore-4.2.1.jar
-webapps/openmeetings/screensharing/mina-core-2.0.7.jar
-webapps/openmeetings/screensharing/spring-beans-4.0.6.RELEASE.jar
-webapps/openmeetings/screensharing/spring-context-4.0.6.RELEASE.jar
-webapps/openmeetings/screensharing/spring-core-4.0.6.RELEASE.jar
+webapps/openmeetings/screensharing/mina-core-2.0.8.jar
+webapps/openmeetings/screensharing/spring-beans-4.0.8.RELEASE.jar
+webapps/openmeetings/screensharing/spring-context-4.0.8.RELEASE.jar
+webapps/openmeetings/screensharing/spring-core-4.0.8.RELEASE.jar
lib/cglib-jar-2.2.2.jar
-lib/commons-beanutils-1.8.3.jar
-lib/commons-codec-1.6.jar
-lib/commons-collections-20040616.jar
+lib/commons-beanutils-1.9.2.jar
+lib/commons-codec-1.9.jar
+lib/commons-collections-3.2.1.jar
lib/commons-fileupload-jar-1.3.jar
lib/commons-io-jar-2.4.jar
-lib/commons-lang3-3.1.jar
-lib/commons-modeler-2.0.1.jar
+lib/commons-lang3-3.3.2.jar
lib/commons-pool-1.5.6.jar
-lib/ehcache-core-2.5.0.jar
+lib/ehcache-core-2.6.9.jar
lib/geronimo-jpa_2.0_spec-bundle-1.1.jar
-lib/httpclient-4.2.1.jar
-lib/httpcore-4.2.1.jar
-lib/mina-core-2.0.7.jar
-lib/mina-integration-beans-2.0.7.jar
-lib/mina-integration-jmx-2.0.7.jar
+lib/httpclient-4.3.5.jar
+lib/httpcore-4.3.2.jar
+lib/mina-core-2.0.8.jar
+lib/mina-integration-beans-2.0.8.jar
+lib/mina-integration-jmx-2.0.8.jar
lib/quartz-2.1.7.jar
lib/red5-*.jar
-lib/spring-aop-4.0.6.RELEASE.jar
-lib/spring-aspects-jar-4.0.6.RELEASE.jar
-lib/spring-beans-4.0.6.RELEASE.jar
-lib/spring-context-4.0.6.RELEASE.jar
-lib/spring-context-support-4.0.6.RELEASE.jar
-lib/spring-context-support-jar-4.0.6.RELEASE.jar
-lib/spring-core-4.0.6.RELEASE.jar
-lib/spring-expression-4.0.6.RELEASE.jar
-lib/spring-jdbc-jar-4.0.6.RELEASE.jar
-lib/spring-orm-jar-4.0.6.RELEASE.jar
-lib/spring-test-4.0.6.RELEASE.jar
-lib/spring-tx-jar-4.0.6.RELEASE.jar
-lib/spring-web-4.0.6.RELEASE.jar
-lib/spring-webmvc-jar-4.0.6.RELEASE.jar
+lib/spring-aop-4.0.8.RELEASE.jar
+lib/spring-aspects-jar-4.0.8.RELEASE.jar
+lib/spring-beans-4.0.8.RELEASE.jar
+lib/spring-context-4.0.8.RELEASE.jar
+lib/spring-context-support-4.0.8.RELEASE.jar
+lib/spring-context-support-jar-4.0.8.RELEASE.jar
+lib/spring-core-4.0.8.RELEASE.jar
+lib/spring-expression-4.0.8.RELEASE.jar
+lib/spring-jdbc-jar-4.0.8.RELEASE.jar
+lib/spring-orm-jar-4.0.8.RELEASE.jar
+lib/spring-test-4.0.8.RELEASE.jar
+lib/spring-tx-jar-4.0.8.RELEASE.jar
+lib/spring-web-4.0.8.RELEASE.jar
+lib/spring-webmvc-jar-4.0.8.RELEASE.jar
lib/xercesImpl-2.9.1.jar
plugins/tomcat-embed-core.jar
Modified: openmeetings/branches/3.0.x/build.properties
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/build.properties?rev=1648090&r1=1648089&r2=1648090&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/build.properties (original)
+++ openmeetings/branches/3.0.x/build.properties Sat Dec 27 18:50:18 2014
@@ -12,10 +12,9 @@
project.version=3.0.4
project.status=SNAPSHOT
project.distname=openmeetings
-ivy.install.version=2.4.0-rc1
+ivy.install.version=2.4.0
maven.version=3.2.2
-red5.server.version=1.0.3-RELEASE
-red5.client.version=1.0.3-RELEASE
+red5.server.version=1.0.4-RELEASE
laszlo.proxied=solo
wicket.mode=DEPLOYMENT
backup.file.list=backup_v_1_4_rc1_r3326.zip,backup_v_1_5_rc1_r3393.zip,backup_v_1_6_2_r3675.zip,backup_v_1_7_0_r3822.zip,backup_v_1_8_8_r4555.zip,backup_v_1_9_1_r4707.zip,backup_v_2_0_0_r1361497.zip
Modified: openmeetings/branches/3.0.x/build.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/build.xml?rev=1648090&r1=1648089&r2=1648090&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/build.xml (original)
+++ openmeetings/branches/3.0.x/build.xml Sat Dec 27 18:50:18 2014
@@ -221,7 +221,6 @@
<!-- build webapp -->
<target name="-copy-libraries" description="All jars downloaded by ivy copied to appropriate places">
<copy todir="${red5.root}/lib">
- <fileset dir="${red5.client.lib}" includes="red5-client*.jar" />
<fileset dir="${mainlibs.lib.dir}" includes="*.jar" />
</copy>
<copy todir="${dist.webapps.dir}/WEB-INF/lib">
@@ -331,8 +330,8 @@
<fileset dir="${red5.server.lib}" includes="spring-beans-*.jar" />
<fileset dir="${red5.server.lib}" includes="logback*.jar" />
<fileset dir="${red5.server.lib}" includes="mina-core*.jar" />
- <fileset dir="${red5.server.lib}" includes="com.springsource.slf4j.api*.jar" />
<fileset dir="${red5.server.lib}" includes="red5-io*.jar" />
+ <fileset dir="${red5.server.lib}" includes="red5-server-common*.jar" />
<fileset dir="${red5.lib}" includes="red5-server.jar" />
<fileset dir="${red5.client.lib}" includes="red5*.jar" />
</copy>
@@ -1209,13 +1208,15 @@
<!-- Check for the Red5 server libraries -->
<target name="-retrieve-red5-server" unless="red5.server.installed" description="Retrieves the libraries if needed" depends="-ant-task,-maven-task,-jgit-task">
<!-- Needs an empty dir to checkout to -->
- <delete dir="${red5.server.dir}"></delete>
+ <delete dir="${red5.server.dir}"/>
<git-clone uri="https://github.com/Red5/red5-server.git" dest="${red5.server.dir}" branch="v${red5.server.version}"/>
<artifact:mvn pom="${red5.server.dir}/pom.xml" mavenVersion="${maven.version}" fork="true" dir="${red5.server.dir}">
<jvmarg value="-Dmaven.buildNumber.doUpdate=false" />
<!--jvmarg value="-Dassembly.skipAssembly=true" /-->
<arg value="clean"/>
- <arg value="install"/>
+ <arg value="package"/>
+ <arg value="-P"/>
+ <arg value="assemble"/>
<jvmarg value="-Dmaven.test.skip=true" />
</artifact:mvn>
<untar src="${red5.server.dir}/target/red5-server-${red5.server.version}-server.tar.gz" dest="${red5.server.dir}/target" compression="gzip"/>
Modified: openmeetings/branches/3.0.x/ivy.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivy.xml?rev=1648090&r1=1648089&r2=1648090&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivy.xml (original)
+++ openmeetings/branches/3.0.x/ivy.xml Sat Dec 27 18:50:18 2014
@@ -52,22 +52,22 @@
<dependency org="asm" name="asm" rev="3.1" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="spring-aspects" rev="4.0.6.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="spring-aspects" rev="4.0.8.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="spring-jdbc" rev="4.0.6.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="spring-jdbc" rev="4.0.8.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="spring-orm" rev="4.0.6.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="spring-orm" rev="4.0.8.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="spring-tx" rev="4.0.6.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="spring-tx" rev="4.0.8.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="spring-webmvc" rev="4.0.6.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="spring-webmvc" rev="4.0.8.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="spring-context-support" rev="4.0.6.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="spring-context-support" rev="4.0.8.RELEASE" transitive="false">
<include type="jar" />
</dependency>
<!-- include type="bundle" / FIXME unable to get geronimo-jpa without sources -->
@@ -353,7 +353,7 @@
<!-- END OF OPENMEETINGS -->
<!-- START OF JUNIT -->
- <dependency org="org.springframework" name="spring-test" rev="4.0.6.RELEASE" conf="junit->*" transitive="false">
+ <dependency org="org.springframework" name="spring-test" rev="4.0.8.RELEASE" conf="junit->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="ant-contrib" name="ant-contrib" rev="1.0b3" conf="junit->*" transitive="false">
@@ -420,13 +420,13 @@
</dependency>
<!-- JGIT -->
- <dependency org="org.eclipse.jgit" name="org.eclipse.jgit.ant" conf="jgit->*" rev="3.4.1.201406201815-r" transitive="true" >
+ <dependency org="org.eclipse.jgit" name="org.eclipse.jgit.ant" conf="jgit->*" rev="3.6.0.201412230720-r" transitive="true" >
<include type="jar" />
<exclude org="org.apache.ant"/>
</dependency>
<!-- red5-client -->
- <dependency org="org.red5" name="red5-client" conf="red5-client->*" rev="1.0.3-RELEASE" transitive="false" >
+ <dependency org="org.red5" name="red5-client" conf="red5-client->*" rev="1.0.4-RELEASE" transitive="false" >
<include type="jar" />
</dependency>