Author: solomax
Date: Thu Sep 15 15:43:51 2016
New Revision: 1760951
URL: http://svn.apache.org/viewvc?rev=1760951&view=rev
Log:
[OPENMEETINGS-1373] tomcat is updated to 8.5.5, red5 to 1.0.8-M12
Modified:
openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml
openmeetings/application/branches/3.2.x/openmeetings-web/pom.xml
openmeetings/application/branches/3.2.x/pom.xml
Modified: openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml?rev=1760951&r1=1760950&r2=1760951&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml
(original)
+++ openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml Thu Sep
15 15:43:51 2016
@@ -117,7 +117,7 @@
<id>prepare-red5-server</id>
<activation>
<file>
-
<missing>red5-server/red5-server-1.0.8-M10.tar.gz</missing> <!-- TODO should be
in-sync with global property -->
+
<missing>red5-server/red5-server-1.0.8-M12.tar.gz</missing> <!-- TODO should be
in-sync with global property -->
</file>
</activation>
<build>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/pom.xml?rev=1760951&r1=1760950&r2=1760951&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/pom.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/pom.xml Thu Sep 15
15:43:51 2016
@@ -472,6 +472,10 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
@@ -496,12 +500,6 @@
<version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-juli</artifactId>
- <version>${tomcat.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
Modified: openmeetings/application/branches/3.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/pom.xml?rev=1760951&r1=1760950&r2=1760951&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/pom.xml (original)
+++ openmeetings/application/branches/3.2.x/pom.xml Thu Sep 15 15:43:51 2016
@@ -44,8 +44,8 @@
<wicket.version>7.4.0</wicket.version>
<wicketju.version>7.4.0</wicketju.version>
<wickets.version>7.4.0</wickets.version>
- <red5-server.version>1.0.8-M10</red5-server.version>
- <red5-client.version>1.0.8-M10</red5-client.version>
+ <red5-server.version>1.0.8-M12</red5-server.version>
+ <red5-client.version>1.0.8-M12</red5-client.version>
<commons-transaction.version>1.2</commons-transaction.version>
<ical4j.version>2.0-beta1</ical4j.version>
<cxf.version>3.1.7</cxf.version>
@@ -55,7 +55,7 @@
<site.basedir>${project.basedir}</site.basedir>
<skip.site.copy>true</skip.site.copy>
<src.pack.skip>false</src.pack.skip>
- <tomcat.version>8.0.36</tomcat.version>
+ <tomcat.version>8.5.5</tomcat.version>
<derby.version>10.12.1.1</derby.version>
</properties>
<profiles>
