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 2021/06/19 17:28:13 UTC
[openmeetings] 01/02: Merge branch 'master' into
OPENMEETINGS-2624-datetime
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
commit 2ea20b917e6b9eabc1a88f4eeb15bdef88cac79b
Merge: 26627b8 9823076
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Jun 18 00:30:48 2021 +0700
Merge branch 'master' into OPENMEETINGS-2624-datetime
openmeetings-server/pom.xml | 2 +-
.../org/apache/openmeetings/web/admin/groups/GroupsPanel.html | 9 +++++++--
.../org/apache/openmeetings/web/admin/groups/GroupsPanel.java | 2 ++
pom.xml | 6 +++---
4 files changed, 13 insertions(+), 6 deletions(-)
diff --cc pom.xml
index dade52f,dd9be71..97dbe74
--- a/pom.xml
+++ b/pom.xml
@@@ -79,12 -79,12 +79,12 @@@
<!-- dependency versions -->
<junit.version>5.7.1</junit.version>
<wicket.version>9.3.0</wicket.version>
- <wicket-jquery-ui.version>9.3.1</wicket-jquery-ui.version>
+ <wicket-jquery-ui.version>9.3.2-SNAPSHOT</wicket-jquery-ui.version>
<wicketstuff.version>9.3.0</wicketstuff.version>
- <wicket-bootstrap.version>5.0.4</wicket-bootstrap.version>
+ <wicket-bootstrap.version>5.0.5-SNAPSHOT</wicket-bootstrap.version>
<font-awesome.version>5.15.2</font-awesome.version>
<spring.version>5.3.8</spring.version>
- <tomcat.version>9.0.46</tomcat.version>
+ <tomcat.version>9.0.48</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>