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/28 01:19:22 UTC
[1/3] openmeetings git commit: [OPENMEETINGS-980] red5 version is
updated
Repository: openmeetings
Updated Branches:
refs/heads/3.3.x 3f1968e73 -> 67f8eb7c9
[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/0f0c44d7
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/0f0c44d7
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/0f0c44d7
Branch: refs/heads/3.3.x
Commit: 0f0c44d761eedfb5226c565a2f064cada85bf3d9
Parents: 3f1968e
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Jul 24 21:36:51 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Jul 28 08:17:02 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/0f0c44d7/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/0f0c44d7/openmeetings-server/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index 5b5b9f7..f55ca32 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/0f0c44d7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a2e276a..c22378a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,11 +43,11 @@
<wicket.version>8.0.0-M6</wicket.version>
<wicketju.version>8.0.0-M6</wicketju.version>
<wickets.version>8.0.0-M6</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.12</cxf.version>
<selenium.version>3.4.0</selenium.version>
[3/3] openmeetings git commit: [OPENMEETINGS-980] red5,
spring and tomcat are updated
Posted by so...@apache.org.
[OPENMEETINGS-980] red5, spring and tomcat are updated
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/67f8eb7c
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/67f8eb7c
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/67f8eb7c
Branch: refs/heads/3.3.x
Commit: 67f8eb7c9bb1d4b5a18ef974bed3d1c1ce257b46
Parents: e242740
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Jul 28 08:13:52 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Jul 28 08:19:11 2017 +0700
----------------------------------------------------------------------
openmeetings-server/pom.xml | 2 +-
pom.xml | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/67f8eb7c/openmeetings-server/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index ca8ba7c..3949b79 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.10-M1.tar.gz</missing> <!-- TODO should be in-sync with global property -->
+ <missing>red5-server/red5-server-1.0.10-M2.tar.gz</missing> <!-- TODO should be in-sync with global property -->
</file>
</activation>
<build>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/67f8eb7c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 89f627e..5f6a80e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,11 +43,11 @@
<wicket.version>8.0.0-M6</wicket.version>
<wicketju.version>8.0.0-M6</wicketju.version>
<wickets.version>8.0.0-M6</wickets.version>
- <red5-server.version>1.0.10-M1</red5-server.version>
- <red5-client.version>1.0.10-M1</red5-client.version>
- <spring.version>4.3.8.RELEASE</spring.version>
+ <red5-server.version>1.0.10-M2</red5-server.version>
+ <red5-client.version>1.0.10-M2</red5-client.version>
+ <spring.version>4.3.10.RELEASE</spring.version>
<mina.version>2.0.16</mina.version>
- <tomcat.version>8.5.15</tomcat.version>
+ <tomcat.version>8.5.16</tomcat.version>
<ical4j.version>2.0.2</ical4j.version>
<cxf.version>3.1.12</cxf.version>
<selenium.version>3.4.0</selenium.version>
[2/3] openmeetings git commit: [OPENMEETINGS-980] red5 is updated
Posted by so...@apache.org.
[OPENMEETINGS-980] red5 is updated
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/e2427404
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/e2427404
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/e2427404
Branch: refs/heads/3.3.x
Commit: e2427404d97e581d8f3513b82a38ecb4744d8ff9
Parents: 0f0c44d
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Jul 27 23:38:17 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Jul 28 08:18:14 2017 +0700
----------------------------------------------------------------------
openmeetings-server/pom.xml | 2 +-
pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e2427404/openmeetings-server/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index f55ca32..ca8ba7c 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-RELEASE.tar.gz</missing> <!-- TODO should be in-sync with global property -->
+ <missing>red5-server/red5-server-1.0.10-M1.tar.gz</missing> <!-- TODO should be in-sync with global property -->
</file>
</activation>
<build>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e2427404/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c22378a..89f627e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,8 +43,8 @@
<wicket.version>8.0.0-M6</wicket.version>
<wicketju.version>8.0.0-M6</wicketju.version>
<wickets.version>8.0.0-M6</wickets.version>
- <red5-server.version>1.0.9-RELEASE</red5-server.version>
- <red5-client.version>1.0.9-RELEASE</red5-client.version>
+ <red5-server.version>1.0.10-M1</red5-server.version>
+ <red5-client.version>1.0.10-M1</red5-client.version>
<spring.version>4.3.8.RELEASE</spring.version>
<mina.version>2.0.16</mina.version>
<tomcat.version>8.5.15</tomcat.version>