Author: solomax
Date: Tue Feb 21 07:52:33 2017
New Revision: 1783841
URL: http://svn.apache.org/viewvc?rev=1783841&view=rev
Log:
[OPENMEETINGS-980] red5, spring and tomcat versions are updated
Modified:
openmeetings/application/trunk/LICENSE
openmeetings/application/trunk/openmeetings-server/pom.xml
openmeetings/application/trunk/openmeetings-server/src/main/assembly/components/all.xml
openmeetings/application/trunk/openmeetings-server/src/main/assembly/conf/jee-container.xml
openmeetings/application/trunk/pom.xml
Modified: openmeetings/application/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/LICENSE?rev=1783841&r1=1783840&r2=1783841&view=diff
==============================================================================
--- openmeetings/application/trunk/LICENSE (original)
+++ openmeetings/application/trunk/LICENSE Tue Feb 21 07:52:33 2017
@@ -298,8 +298,8 @@ webapps/openmeetings/WEB-INF/lib/geronim
webapps/openmeetings/WEB-INF/lib/groovy-all-2.3.2.jar
webapps/openmeetings/WEB-INF/lib/gson-2.2.4.jar
webapps/openmeetings/WEB-INF/lib/guava-18.0.jar
-webapps/openmeetings/WEB-INF/lib/httpclient-4.5.2.jar
-webapps/openmeetings/WEB-INF/lib/httpcore-4.4.4.jar
+webapps/openmeetings/WEB-INF/lib/httpclient-*.jar
+webapps/openmeetings/WEB-INF/lib/httpcore-*.jar
webapps/openmeetings/WEB-INF/lib/jettison-1.3.8.jar
webapps/openmeetings/WEB-INF/lib/joda-time-2.9.4.jar
webapps/openmeetings/WEB-INF/lib/jodconverter-core-3.0.1-om.jar
Modified: openmeetings/application/trunk/openmeetings-server/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/pom.xml?rev=1783841&r1=1783840&r2=1783841&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-server/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-server/pom.xml Tue Feb 21
07:52:33 2017
@@ -117,7 +117,7 @@
<id>prepare-red5-server</id>
<activation>
<file>
-
<missing>red5-server/red5-server-1.0.8-RELEASE.tar.gz</missing> <!-- TODO
should be in-sync with global property -->
+
<missing>red5-server/red5-server-1.0.9-M2.tar.gz</missing> <!-- TODO should be
in-sync with global property -->
</file>
</activation>
<build>
Modified:
openmeetings/application/trunk/openmeetings-server/src/main/assembly/components/all.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/main/assembly/components/all.xml?rev=1783841&r1=1783840&r2=1783841&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-server/src/main/assembly/components/all.xml
(original)
+++
openmeetings/application/trunk/openmeetings-server/src/main/assembly/components/all.xml
Tue Feb 21 07:52:33 2017
@@ -32,6 +32,7 @@
<exclude>webapps/root/demos/**</exclude>
<exclude>webapps/root/index.html</exclude>
<exclude>lib/commons-io*.jar</exclude>
+ <exclude>plugins/websocket*.jar</exclude>
<exclude>*.sh</exclude>
<exclude>conf/jee-container.xml</exclude>
</excludes>
@@ -107,6 +108,7 @@
<exclude>WEB-INF/lib/commons-codec*</exclude>
<exclude>WEB-INF/lib/commons-collections-*</exclude>
<exclude>WEB-INF/lib/commons-lang3*</exclude>
+ <exclude>WEB-INF/lib/jcl-over-slf4j*</exclude>
</excludes>
</fileSet>
<fileSet>
Modified:
openmeetings/application/trunk/openmeetings-server/src/main/assembly/conf/jee-container.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/main/assembly/conf/jee-container.xml?rev=1783841&r1=1783840&r2=1783841&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-server/src/main/assembly/conf/jee-container.xml
(original)
+++
openmeetings/application/trunk/openmeetings-server/src/main/assembly/conf/jee-container.xml
Tue Feb 21 07:52:33 2017
@@ -96,7 +96,6 @@
<entry
key="sslProtocol" value="TLS" />
<entry
key="keystoreFile" value="${rtmps.keystorefile}" />
<entry
key="keystorePass" value="${rtmps.keystorepass}" />
- <entry
key="keystoreType" value="JKS" />
<entry
key="truststoreFile" value="${rtmps.truststorefile}" />
<entry
key="truststorePass" value="${rtmps.truststorepass}" />
<entry key="clientAuth"
value="false" />
Modified: openmeetings/application/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/pom.xml?rev=1783841&r1=1783840&r2=1783841&view=diff
==============================================================================
--- openmeetings/application/trunk/pom.xml (original)
+++ openmeetings/application/trunk/pom.xml Tue Feb 21 07:52:33 2017
@@ -43,11 +43,11 @@
<wicket.version>8.0.0-M4</wicket.version>
<wicketju.version>8.0.0-M4</wicketju.version>
<wickets.version>8.0.0-M4</wickets.version>
- <red5-server.version>1.0.8-RELEASE</red5-server.version>
- <red5-client.version>1.0.8-RELEASE</red5-client.version>
- <spring.version>4.3.5.RELEASE</spring.version>
+ <red5-server.version>1.0.9-M2</red5-server.version>
+ <red5-client.version>1.0.9-M2</red5-client.version>
+ <spring.version>4.3.6.RELEASE</spring.version>
<mina.version>2.0.16</mina.version>
- <tomcat.version>8.5.9</tomcat.version>
+ <tomcat.version>8.5.11</tomcat.version>
<ical4j.version>2.0.0</ical4j.version>
<cxf.version>3.1.9</cxf.version>
<selenium.version>3.0.1</selenium.version>
@@ -577,6 +577,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+
<groupId>org.apache.httpcomponents</groupId>
+
<artifactId>httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
