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 2017/07/24 14:37:00 UTC
openmeetings git commit: [OPENMEETINGS-980] red5 version is updated
Repository: openmeetings
Updated Branches:
refs/heads/master 2403f45c1 -> d5bb1af52
[OPENMEETINGS-980] red5 version is updated
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d5bb1af5
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d5bb1af5
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d5bb1af5
Branch: refs/heads/master
Commit: d5bb1af5212c10d05b01cab8ac481ed3b8cb4d67
Parents: 2403f45
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Jul 24 21:36:51 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Jul 24 21:36:51 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/openmeetings/screenshare/util/Util.java | 2 --
openmeetings-server/pom.xml | 2 +-
pom.xml | 8 ++++----
3 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d5bb1af5/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/util/Util.java
----------------------------------------------------------------------
diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/util/Util.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/util/Util.java
index a7094d9..2aeb02b 100644
--- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/util/Util.java
+++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/util/Util.java
@@ -19,7 +19,6 @@
package org.apache.openmeetings.screenshare.util;
import static org.quartz.impl.StdSchedulerFactory.PROP_SCHED_INSTANCE_NAME;
-import static org.quartz.impl.StdSchedulerFactory.PROP_SCHED_SKIP_UPDATE_CHECK;
import java.util.Map;
import java.util.Properties;
@@ -27,7 +26,6 @@ import java.util.Properties;
public class Util {
public static Properties getQurtzProps(String name) {
final Properties p = new Properties();
- p.put(PROP_SCHED_SKIP_UPDATE_CHECK, "true");
p.put(PROP_SCHED_INSTANCE_NAME, name);
p.put("org.quartz.threadPool.threadCount", "10");
return p;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d5bb1af5/openmeetings-server/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index 3b39df5..0af995d 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -118,7 +118,7 @@
<id>prepare-red5-server</id>
<activation>
<file>
- <missing>red5-server/red5-server-1.0.9-M6.tar.gz</missing> <!-- TODO should be in-sync with global property -->
+ <missing>red5-server/red5-server-1.0.9-RELEASE.tar.gz</missing> <!-- TODO should be in-sync with global property -->
</file>
</activation>
<build>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d5bb1af5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6ff475f..27ea708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,11 +43,11 @@
<wicket.version>8.0.0-SNAPSHOT</wicket.version>
<wicketju.version>8.0.0-SNAPSHOT</wicketju.version>
<wickets.version>8.0.0-SNAPSHOT</wickets.version>
- <red5-server.version>1.0.9-M6</red5-server.version>
- <red5-client.version>1.0.9-M6</red5-client.version>
- <spring.version>4.3.6.RELEASE</spring.version>
+ <red5-server.version>1.0.9-RELEASE</red5-server.version>
+ <red5-client.version>1.0.9-RELEASE</red5-client.version>
+ <spring.version>4.3.8.RELEASE</spring.version>
<mina.version>2.0.16</mina.version>
- <tomcat.version>8.5.12</tomcat.version>
+ <tomcat.version>8.5.15</tomcat.version>
<ical4j.version>2.0.2</ical4j.version>
<cxf.version>3.1.11</cxf.version>
<selenium.version>3.4.0</selenium.version>