Author: solomax
Date: Fri Oct 14 02:21:42 2016
New Revision: 1764802

URL: http://svn.apache.org/viewvc?rev=1764802&view=rev
Log:
[OPENMEETINGS-1373, OPENMEETINGS-1482] red5 version is bumped; mysql warnings 
are reduced

Modified:
    openmeetings/application/branches/3.1.x/LICENSE
    openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml
    openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
    openmeetings/application/branches/3.1.x/pom.xml

Modified: openmeetings/application/branches/3.1.x/LICENSE
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/LICENSE?rev=1764802&r1=1764801&r2=1764802&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/LICENSE (original)
+++ openmeetings/application/branches/3.1.x/LICENSE Fri Oct 14 02:21:42 2016
@@ -310,13 +310,7 @@ webapps/root/WEB-INF/web.xml
 webapps/openmeetings/WEB-INF/lib/api-all-1.0.0-RC1.jar
 webapps/openmeetings/WEB-INF/lib/asterisk-java-1.0.0-final.jar
 webapps/openmeetings/WEB-INF/lib/bndlib-2.3.0.jar
-webapps/openmeetings/WEB-INF/lib/commons-cli-1.3.1.jar
-webapps/openmeetings/WEB-INF/lib/commons-collections4-4.1.jar
-webapps/openmeetings/WEB-INF/lib/commons-dbcp2-2.1.1.jar
-webapps/openmeetings/WEB-INF/lib/commons-lang-2.4.jar
-webapps/openmeetings/WEB-INF/lib/commons-pool-1.6.jar
-webapps/openmeetings/WEB-INF/lib/commons-pool2-2.4.2.jar
-webapps/openmeetings/WEB-INF/lib/commons-transaction-1.2.jar
+webapps/openmeetings/WEB-INF/lib/commons-*.jar
 webapps/openmeetings/WEB-INF/lib/cxf-*.jar
 webapps/openmeetings/WEB-INF/lib/derby-10.12.1.1.jar
 webapps/openmeetings/WEB-INF/lib/derbyclient-10.12.1.1.jar
@@ -357,14 +351,7 @@ webapps/openmeetings/screenshare/openmee
 lib/apache-mime4j-core-0.7.2.jar
 lib/apache-mime4j-dom-0.7.2.jar
 lib/boilerpipe-1.1.0.jar
-lib/commons-beanutils-1.9.2.jar
-lib/commons-codec-1.10.jar
-lib/commons-collections-3.2.2.jar
-lib/commons-compress-1.11.jar
-lib/commons-daemon-1.0.15.jar
-lib/commons-fileupload-1.3.2.jar
-lib/commons-io-2.5.jar
-lib/commons-lang3-3.4.jar
+lib/commons-*.jar
 lib/ehcache-core-2.6.11.jar
 lib/geronimo-jpa_2.0_spec-1.1.jar
 lib/gson-2.2.4.jar
@@ -374,30 +361,24 @@ lib/isoparser-1.1.17.jar
 lib/jackson-core-2.7.1.jar
 lib/jempbox-1.8.12.jar
 lib/metadata-extractor-2.8.1.jar
-lib/mina-core-2.0.14.jar
-lib/mina-integration-beans-2.0.14.jar
-lib/mina-integration-jmx-2.0.14.jar
+lib/mina-*.jar
 lib/ognl-3.1.2.jar
-lib/pdfbox-debugger-2.0.1.jar
-lib/pdfbox-tools-2.0.1.jar
+lib/pdfbox-*.jar
 lib/quartz-2.2.2.jar
 lib/red5-*.jar
 lib/rome-1.5.1.jar
 lib/rome-utils-1.5.1.jar
 lib/spring-*.jar
 lib/tagsoup-1.2.1.jar
-lib/tika-core-1.13.jar
-lib/tika-parsers-1.13.jar
+lib/tika-*.jar
 lib/xercesImpl-2.11.0.jar
 lib/xml-apis-1.4.01.jar
 
-plugins/tomcat-embed-core-8.0.36.jar
-plugins/tomcat-embed-el-8.0.36.jar
-plugins/tomcat-embed-jasper-8.0.36.jar
-plugins/tomcat-embed-logging-juli-8.0.36.jar
-plugins/tomcat-embed-websocket-8.0.36.jar
-plugins/tomcatplugin-1.13.jar
-plugins/websocket-1.6.jar
+plugins/java-property-utils-*.jar
+plugins/cors-filter-*.jar
+plugins/tomcat-*.jar
+plugins/tomcatplugin-*.jar
+plugins/websocket-*.jar
 
 
======================================================================================================================
 

Modified: 
openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml?rev=1764802&r1=1764801&r2=1764802&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml 
(original)
+++ openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml 
Fri Oct 14 02:21:42 2016
@@ -47,7 +47,7 @@
                <dependency>
                        <groupId>org.apache.mina</groupId>
                        <artifactId>mina-core</artifactId>
-                       <version>2.0.14</version>
+                       <version>${mina.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.springframework</groupId>

Modified: openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml?rev=1764802&r1=1764801&r2=1764802&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml 
(original)
+++ openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml Fri Oct 
14 02:21:42 2016
@@ -117,7 +117,7 @@
                        <id>prepare-red5-server</id>
                        <activation>
                                <file>
-                                       
<missing>red5-server/red5-server-1.0.8-M12.tar.gz</missing> <!-- TODO should be 
in-sync with global property -->
+                                       
<missing>red5-server/red5-server-1.0.8-M13.tar.gz</missing> <!-- TODO should be 
in-sync with global property -->
                                </file>
                        </activation>
                        <build>

Modified: 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml?rev=1764802&r1=1764801&r2=1764802&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
 Fri Oct 14 02:21:42 2016
@@ -68,7 +68,7 @@
                        <property name="openjpa.ConnectionDriverName" 
value="org.apache.commons.dbcp2.BasicDataSource" />
                        <property name="openjpa.ConnectionProperties"
                                value="DriverClassName=com.mysql.jdbc.Driver
-                                       , 
Url=jdbc:mysql://localhost:3306/openmeetings_3_1?autoReconnect=true&amp;useUnicode=true&amp;createDatabaseIfNotExist=true&amp;characterEncoding=utf-8&amp;connectionCollation=utf8_general_ci&amp;cachePrepStmts=true&amp;cacheCallableStatements=true&amp;cacheServerConfiguration=true&amp;useLocalSessionState=true&amp;elideSetAutoCommits=true&amp;alwaysSendSetIsolation=false&amp;enableQueryTimeouts=false&amp;prepStmtCacheSize=3000&amp;prepStmtCacheSqlLimit=1000
+                                       , 
Url=jdbc:mysql://localhost:3306/openmeetings_3_1?autoReconnect=true&amp;useUnicode=true&amp;createDatabaseIfNotExist=true&amp;characterEncoding=utf-8&amp;connectionCollation=utf8_general_ci&amp;cachePrepStmts=true&amp;cacheCallableStatements=true&amp;cacheServerConfiguration=true&amp;useLocalSessionState=true&amp;elideSetAutoCommits=true&amp;alwaysSendSetIsolation=false&amp;enableQueryTimeouts=false&amp;prepStmtCacheSize=3000&amp;prepStmtCacheSqlLimit=1000&amp;useSSL=false
                                        , MaxActive=100
                                        , MaxWait=10000
                                        , TestOnBorrow=true

Modified: openmeetings/application/branches/3.1.x/pom.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/pom.xml?rev=1764802&r1=1764801&r2=1764802&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/pom.xml Fri Oct 14 02:21:42 2016
@@ -36,7 +36,6 @@
                <wicket.mode>DEPLOYMENT</wicket.mode>
                <om.quick.build>false</om.quick.build>
                <db>derby</db>
-               <spring.version>4.3.2.RELEASE</spring.version>
                <junit.version>4.12</junit.version>
                <maven.javadoc.version>2.10.3</maven.javadoc.version>
                <maven.surefire.version>2.19.1</maven.surefire.version>
@@ -44,8 +43,11 @@
                <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-M12</red5-server.version>
-               <red5-client.version>1.0.8-M12</red5-client.version>
+               <red5-server.version>1.0.8-M13</red5-server.version>
+               <red5-client.version>1.0.8-M13</red5-client.version>
+               <spring.version>4.3.3.RELEASE</spring.version>
+               <mina.version>2.0.15</mina.version>
+               <tomcat.version>8.5.6</tomcat.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 +57,6 @@
                <site.basedir>${project.basedir}</site.basedir>
                <skip.site.copy>true</skip.site.copy>
                <src.pack.skip>false</src.pack.skip>
-               <tomcat.version>8.5.5</tomcat.version>
                <derby.version>10.12.1.1</derby.version>
        </properties>
        <profiles>


Reply via email to