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 2022/06/10 05:31:21 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2732] tomcat, jettison, postgresql, mssql-driver, oracle-driver, MathJax
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 2925e9f7c [OPENMEETINGS-2732] tomcat, jettison, postgresql, mssql-driver, oracle-driver, MathJax
2925e9f7c is described below
commit 2925e9f7c6b9dcf49ba6ab4d7062cb595d2b9672
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Jun 10 12:31:13 2022 +0700
[OPENMEETINGS-2732] tomcat, jettison, postgresql, mssql-driver, oracle-driver, MathJax
---
openmeetings-server/pom.xml | 2 +-
openmeetings-web/src/main/front/wb/package.json | 7 +++----
openmeetings-web/src/main/front/wb/src/index.js | 7 -------
.../org/apache/openmeetings/web/room/menu/RoomMenuPanel.java | 2 +-
pom.xml | 10 +++++-----
5 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index 4db62cd04..2e20f6f58 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -118,7 +118,7 @@
<id>prepare-web-server</id>
<activation>
<file>
- <missing>web-server/apache-tomcat-9.0.63.tar.gz</missing> <!-- TODO should be in-sync with global property -->
+ <missing>web-server/apache-tomcat-9.0.64.tar.gz</missing> <!-- TODO should be in-sync with global property -->
</file>
</activation>
<build>
diff --git a/openmeetings-web/src/main/front/wb/package.json b/openmeetings-web/src/main/front/wb/package.json
index a8ded1c78..04a3ed5b5 100644
--- a/openmeetings-web/src/main/front/wb/package.json
+++ b/openmeetings-web/src/main/front/wb/package.json
@@ -4,21 +4,20 @@
"description": "Methods for WB",
"main": "src/index.js",
"scripts": {
- "build-dev": "browserify -t brfs src/index.js --transform-key=staging -p esmify -o ${outDir}${npm_package_name}.js",
- "build-prod": "browserify -t brfs src/index.js -t brfs --transform-key=production -p esmify | terser -o ${outDir}${npm_package_name}.min.js",
+ "build-dev": "browserify src/index.js --transform-key=staging -p esmify -o ${outDir}${npm_package_name}.js",
+ "build-prod": "browserify src/index.js --transform-key=production -p esmify | terser -o ${outDir}${npm_package_name}.min.js",
"build": "npm run build-dev && npm run build-prod"
},
"author": "",
"license": "Apache-2.0",
"rat-license": "Licensed under the Apache License, Version 2.0 (the \"License\") http://www.apache.org/licenses/LICENSE-2.0",
"devDependencies": {
- "brfs": "^2.0.2",
"browserify": "^17.0.0",
"esmify": "^2.1.1",
"terser": "^5.13.1"
},
"dependencies": {
"fabric": "^5.2.1",
- "mathjax-full": "^3.2.1"
+ "mathjax-full": "^3.2.2"
}
}
diff --git a/openmeetings-web/src/main/front/wb/src/index.js b/openmeetings-web/src/main/front/wb/src/index.js
index 4fe899e18..1c51ebe36 100644
--- a/openmeetings-web/src/main/front/wb/src/index.js
+++ b/openmeetings-web/src/main/front/wb/src/index.js
@@ -1,12 +1,5 @@
/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */
-// HACK!!!!! to avoid eval to determine MathJax version
-const fs = require('fs')
- , pkg_src = fs.readFileSync(__dirname + '/../node_modules/mathjax-full/package.json', 'utf8');
-
-window.PACKAGE_VERSION = JSON.parse(pkg_src).version;
-// END HACK
-
Object.assign(window, {
InterviewWbArea: require('./interview-area')
, DrawWbArea: require('./wb-area')
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
index d96d16f2a..982b59d3d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
@@ -228,7 +228,7 @@ public class RoomMenuPanel extends Panel {
handler.add(roomName.add(AttributeModifier.replace(ATTR_CLASS, roomClass), AttributeModifier.replace(ATTR_TITLE, roomTitle)));
handler.add(askBtn.setVisible(!moder && r.isAllowUserQuestions()));
handler.add(shareBtn.setVisible(room.screenShareAllowed()));
- handler.appendJavaScript("$('#share-dlg-btn').off().click(Sharer.open);");
+ handler.appendJavaScript("if (typeof(Sharer) === 'object') {$('#share-dlg-btn').off().click(Sharer.open);}");
}
public void updatePoll(IPartialPageRequestHandler handler, Long createdBy) {
diff --git a/pom.xml b/pom.xml
index 274e3ecc4..cfd81a076 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,13 +86,13 @@
<wicket-bootstrap.version>6.0.0-M6</wicket-bootstrap.version>
<font-awesome.version>6.1.0</font-awesome.version>
<spring.version>5.3.20</spring.version>
- <tomcat.version>9.0.63</tomcat.version>
+ <tomcat.version>9.0.64</tomcat.version>
<ical4j.version>4.0.0-alpha11</ical4j.version>
<cxf.version>3.5.2</cxf.version>
<io.prometheus.version>0.15.0</io.prometheus.version>
<aspectjtools.version>1.9.9.1</aspectjtools.version>
<simple-xml.version>2.7.1</simple-xml.version>
- <jettison.version>1.4.1</jettison.version>
+ <jettison.version>1.5.0</jettison.version>
<site.basedir>${project.basedir}</site.basedir>
<src.pack.skip>false</src.pack.skip>
<h2.version>2.1.212</h2.version>
@@ -106,10 +106,10 @@
<dom4j.version>2.1.3</dom4j.version>
<commons-codec.version>1.15</commons-codec.version>
<commons-io.version>2.11.0</commons-io.version>
- <postgresql.version>42.3.6</postgresql.version>
+ <postgresql.version>42.4.0</postgresql.version>
<mysql.version>8.0.29</mysql.version>
- <mssql.version>10.2.0.jre11</mssql.version>
- <ojdbc.version>19.14.0.0</ojdbc.version>
+ <mssql.version>10.2.1.jre17</mssql.version>
+ <ojdbc.version>19.15.0.0.1</ojdbc.version>
<commons-collections4.version>4.4</commons-collections4.version>
<xstream.version>1.4.19</xstream.version>
<api-all.version>2.1.0</api-all.version>