[openmeetings] 01/02: Merge branch 'master' into bootstrap-5

[so...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch bootstrap-5
in repository https://gitbox.apache.org/repos/asf/openmeetings.git

commit 612551b1be2577c87fa3e6ed5db78cce275647dd
Merge: b13bf82 e3e2402
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Jul 10 11:50:20 2021 +0700

    Merge branch 'master' into bootstrap-5

 openmeetings-server/pom.xml |  2 +-
 pom.xml                     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --cc pom.xml
index 0ce30fe,60cb0b1..c7ea575
--- a/pom.xml
+++ b/pom.xml
@@@ -78,13 -78,13 +78,13 @@@
  		<frontend-maven-plugin.version>1.11.0</frontend-maven-plugin.version>
  		<!-- dependency versions -->
  		<junit.version>5.7.1</junit.version>
- 		<wicket.version>9.3.0</wicket.version>
+ 		<wicket.version>9.4.0</wicket.version>
  		<wicket-jquery-ui.version>9.3.2</wicket-jquery-ui.version>
  		<wicketstuff.version>9.3.0</wicketstuff.version>
 -		<wicket-bootstrap.version>5.0.5</wicket-bootstrap.version>
 +		<wicket-bootstrap.version>6.0.0-SNAPSHOT</wicket-bootstrap.version>
  		<font-awesome.version>5.15.3</font-awesome.version>
  		<spring.version>5.3.8</spring.version>
- 		<tomcat.version>9.0.48</tomcat.version>
+ 		<tomcat.version>9.0.50</tomcat.version>
  		<ical4j.version>3.0.21</ical4j.version>
  		<cxf.version>3.4.4</cxf.version>
  		<io.prometheus.version>0.11.0</io.prometheus.version>