This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new f9ff13f [OPENMEETINGS-2296] maven-surefire-plugin, asterisk-java,
postgresql, xstream, kurento-client and kurento-utils are updated
f9ff13f is described below
commit f9ff13f51c780479c89c713f2c22c8f67fb68528
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sat Jun 20 23:28:12 2020 +0700
[OPENMEETINGS-2296] maven-surefire-plugin, asterisk-java, postgresql,
xstream, kurento-client and kurento-utils are updated
---
.../java/org/apache/openmeetings/web/room/kurento-utils.js | 11 +++++------
pom.xml | 10 +++++-----
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js
index ce5bb19..7a1a416 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js
@@ -7,7 +7,7 @@ var hark = require('hark');
var EventEmitter = require('events').EventEmitter;
var recursive = require('merge').recursive.bind(undefined, true);
var sdpTranslator = require('sdp-translator');
-var logger = window.Logger || console;
+var logger = typeof window === 'undefined' ? console : window.Logger ||
console;
try {
require('kurento-browser-extensions');
} catch (error) {
@@ -25,7 +25,7 @@ var MEDIA_CONSTRAINTS = {
framerate: 15
}
};
-var ua = window && window.navigator ? window.navigator.userAgent : '';
+var ua = typeof window !== 'undefined' && window.navigator ?
window.navigator.userAgent : '';
var parser = new UAParser(ua);
var browser = parser.getBrowser();
var usePlanB = false;
@@ -151,7 +151,6 @@ function WebRtcPeer(mode, options, callback) {
var videoStream = options.videoStream;
var audioStream = options.audioStream;
var mediaConstraints = options.mediaConstraints;
- var connectionConstraints = options.connectionConstraints;
var pc = options.peerConnection;
var sendSource = options.sendSource || 'webcam';
var dataChannelConfig = options.dataChannelConfig;
@@ -393,7 +392,7 @@ function WebRtcPeer(mode, options, callback) {
if (pc.signalingState === 'closed') {
return callback('PeerConnection is closed');
}
- pc.setRemoteDescription(answer, function () {
+ pc.setRemoteDescription(answer).then(function () {
setRemoteVideo();
callback();
}, callback);
@@ -516,7 +515,7 @@ function WebRtcPeer(mode, options, callback) {
}
}
self.removeAllListeners();
- if (window.cancelChooseDesktopMedia !== undefined) {
+ if (typeof window !== 'undefined' && window.cancelChooseDesktopMedia
!== undefined) {
window.cancelChooseDesktopMedia(guid);
}
});
@@ -579,7 +578,7 @@ WebRtcPeer.prototype.dispose = function () {
var dc = this.dataChannel;
try {
if (dc) {
- if (dc.signalingState === 'closed')
+ if (dc.readyState === 'closed')
return;
dc.close();
}
diff --git a/pom.xml b/pom.xml
index a4dacdb..db4ebc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<jdk.version>11</jdk.version>
<!-- plugin versions -->
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
-
<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
+
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<maven-site-plugin.version>3.9.0</maven-site-plugin.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<minify-maven-plugin.version>1.7.6</minify-maven-plugin.version>
@@ -92,10 +92,10 @@
<commons-lang3.version>3.10</commons-lang3.version>
<javax.mail.version>1.6.2</javax.mail.version>
<openjpa.version>3.1.1</openjpa.version>
- <asterisk-java.version>3.1.0</asterisk-java.version>
+ <asterisk-java.version>3.5.0</asterisk-java.version>
<commons-dbcp.version>2.7.0</commons-dbcp.version>
<commons-pool2.version>2.8.0</commons-pool2.version>
- <postgresql.version>42.2.12</postgresql.version>
+ <postgresql.version>42.2.14</postgresql.version>
<commons-cli.version>1.4</commons-cli.version>
<dom4j.version>2.1.3</dom4j.version>
<commons-codec.version>1.14</commons-codec.version>
@@ -103,7 +103,7 @@
<mysql.version>8.0.20</mysql.version>
<mssql.version>8.2.2.jre11</mssql.version>
<commons-collections4.version>4.4</commons-collections4.version>
- <xstream.version>1.4.11.1</xstream.version>
+ <xstream.version>1.4.12</xstream.version>
<api-all.version>2.0.1</api-all.version>
<caldav4j.version>1.0.0-rc.2</caldav4j.version>
<tika-parsers.version>1.24.1</tika-parsers.version>
@@ -116,7 +116,7 @@
<mockito.version>3.3.3</mockito.version>
<powermock.version>2.0.7</powermock.version>
<quartz.version>2.3.2</quartz.version>
- <kurento.version>6.13.1</kurento.version>
+ <kurento.version>6.14.0</kurento.version>
<!-- Exclude all generated code -->
<sonar.exclusions>file:**/generated-sources/**,
file:**/jquery-ui.css, file:**/fabric.js, file:**/cssemoticons.js,
file:**/adapter-latest.js, file:**/kurento-utils.js, file:**/NoSleep.js,
file:**/fileinput*.js, file:**/MathJax.js, file:**/network.js</sonar.exclusions>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
