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/11/23 01:52:57 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2732] spring, tomcat, ical4j, asterisk, slf4j, logback, mockito, swagger, bytebuddy
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 0ab86c954 [OPENMEETINGS-2732] spring, tomcat, ical4j, asterisk, slf4j, logback, mockito, swagger, bytebuddy
0ab86c954 is described below
commit 0ab86c954232ecf2df71eb64269c1fc59cf46bbe
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Nov 23 08:52:46 2022 +0700
[OPENMEETINGS-2732] spring, tomcat, ical4j, asterisk, slf4j, logback, mockito, swagger, bytebuddy
---
.../openmeetings/db/dao/IDataProviderDao.java | 2 +-
.../apache/openmeetings/db/dao/label/LabelDao.java | 2 +-
.../apache/openmeetings/db/dao/user/UserDao.java | 2 +-
.../openmeetings/db/entity/basic/Client.java | 4 ----
.../openmeetings/db/entity/basic/IWsClient.java | 1 -
.../openmeetings/db/entity/basic/WsClient.java | 1 -
.../apache/openmeetings/db/entity/user/User.java | 2 +-
openmeetings-server/pom.xml | 2 +-
.../org/apache/openmeetings/util/ImportHelper.java | 2 +-
.../org/apache/openmeetings/util/crypt/ICrypt.java | 2 +-
.../openmeetings/web/admin/labels/LabelsForm.java | 2 +-
.../openmeetings/web/admin/labels/LangForm.java | 2 +-
.../openmeetings/web/admin/labels/LangPanel.java | 2 +-
.../web/room/poll/PollResultsDialog.java | 4 ----
.../openmeetings/web/room/poll/VoteDialog.java | 4 ----
.../openmeetings/webservice/ErrorWebService.java | 7 -------
.../openmeetings/webservice/InfoWebService.java | 2 +-
.../webservice/RecordingWebService.java | 2 --
pom.xml | 24 +++++++++++-----------
19 files changed, 23 insertions(+), 46 deletions(-)
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java
index a18d987a4..80b616800 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java
@@ -27,7 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
/**
* General interface to perform CRUD operations on entities
*
- * @author solomax, swagner
+ * @author swagner
*
* @param <T> entity type for this provider
*/
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
index 5c7db7d25..1f5ecf394 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
@@ -65,7 +65,7 @@ import org.slf4j.LoggerFactory;
*
* CRUD operations for {@link StringLabel}
*
- * @author solomax, swagner
+ * @author swagner
*
*/
public class LabelDao implements IDataProviderDao<StringLabel>{
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
index f86ac445f..ee68f4eca 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
@@ -76,7 +76,7 @@ import org.springframework.transaction.annotation.Transactional;
/**
* CRUD operations for {@link User}
*
- * @author swagner, solomax, vasya
+ * @author swagner, vasya
*
*/
@Repository
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
index eaabdea93..e16a9657f 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
@@ -46,10 +46,6 @@ import org.apache.wicket.util.string.Strings;
import com.github.openjson.JSONArray;
import com.github.openjson.JSONObject;
-/**
- * @author solomax
- *
- */
public class Client implements IDataProviderEntity, IWsClient {
private static final long serialVersionUID = 1L;
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/IWsClient.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/IWsClient.java
index 550f305fc..4770c42da 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/IWsClient.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/IWsClient.java
@@ -26,7 +26,6 @@ import javax.annotation.Nonnull;
* Necessary for temp clients being created on HashPage
*
* {@link org.apache.openmeetings.db.entity.basic.Client}
- * @author solomax
*
*/
public interface IWsClient extends Serializable {
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/WsClient.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/WsClient.java
index 894c3ae85..b3d7aba0f 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/WsClient.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/WsClient.java
@@ -24,7 +24,6 @@ import javax.annotation.Nonnull;
/**
* Temporary class for test recording, will be unified
- * @author solomax
*
*/
public class WsClient implements IWsClient {
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
index 5c99f74f6..7c7882cc8 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
@@ -90,7 +90,7 @@ import org.apache.wicket.util.string.Strings;
* Entity to store user data, password field is {@link FetchType#LAZY}, so that
* is why there is an extra udpate statement at this moment
*
- * @author sebawagner, solomax
+ * @author sebawagner
*
*/
@Entity
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index b71311a3e..9c94a938b 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.68.tar.gz</missing> <!-- TODO should be in-sync with global property -->
+ <missing>web-server/apache-tomcat-9.0.69.tar.gz</missing> <!-- TODO should be in-sync with global property -->
</file>
</activation>
<build>
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java
index 13fc99757..05b68eca8 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java
@@ -25,7 +25,7 @@ import java.util.Map;
*
* Get some of the default values for the upload
*
- * @author solomax, swagner
+ * @author swagner
*
*/
public class ImportHelper {
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/ICrypt.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/ICrypt.java
index 6f94b7f95..de0931871 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/ICrypt.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/ICrypt.java
@@ -23,7 +23,7 @@ package org.apache.openmeetings.util.crypt;
* https://openmeetings.apache.org/CustomCryptMechanism.html see:
* https://crackstation.net/hashing-security.htm
*
- * @author sebastianwagner, solomax
+ * @author sebastianwagner
*
*/
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java
index 7589eb2ac..d2069ad65 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java
@@ -32,7 +32,7 @@ import org.apache.wicket.model.ResourceModel;
/**
* Add/edit/delete {@link StringLabel}
*
- * @author solomax, swagner
+ * @author swagner
*
*/
public class LabelsForm extends AdminBaseForm<StringLabel> {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
index 15fbe1cad..b8b7ab48b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
@@ -38,7 +38,7 @@ import org.apache.wicket.model.PropertyModel;
/**
* Modify the language selection, add/delete language
*
- * @author solomax, swagner
+ * @author swagner
*
*/
public class LangForm extends Form<Void> {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
index 2219359b3..471fdeddb 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
@@ -70,7 +70,7 @@ import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5I
/**
* Language Editor, add/insert/update Label and add/delete language contains several Forms and one list
*
- * @author solomax, swagner
+ * @author swagner
*
*/
@AuthorizeInstantiation({"ADMIN", "ADMIN_LABEL"})
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
index 73a5f751d..d650d145d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
@@ -66,10 +66,6 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType;
-/**
- * @author solomax
- *
- */
public class PollResultsDialog extends Modal<RoomPoll> {
private static final long serialVersionUID = 1L;
private static final String[] NUM_TICKS = new String[] {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10"};
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
index 83999e1d0..9ef769ca2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
@@ -52,10 +52,6 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
-/**
- * @author solomax
- *
- */
public class VoteDialog extends Modal<RoomPollAnswer> {
private static final long serialVersionUID = 1L;
private static final List<Integer> answers = List.of(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
index 924aeb2e0..3561036e9 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
@@ -48,13 +48,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
-/**
- *
- * The Service contains methods to get localized errors
- *
- * @author solomax
- *
- */
@Service("errorWebService")
@WebService(serviceName="org.apache.openmeetings.webservice.ErrorWebService", targetNamespace = TNS)
@Features(features = "org.apache.cxf.ext.logging.LoggingFeature")
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java
index 15271163e..cb6705401 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java
@@ -52,7 +52,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
*
* The Service contains methods to get info about the system and manifest
*
- * @author solomax, sebawagner
+ * @author sebawagner
*
*/
@Service("infoWebService")
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
index b2059fca7..255412cfd 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
@@ -58,8 +58,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
*
* The Service contains methods to work with recordings
*
- * @author solomax
- *
*/
@Service("recordWebService")
@WebService(serviceName="org.apache.openmeetings.webservice.RecordingWebService", targetNamespace = TNS)
diff --git a/pom.xml b/pom.xml
index 91e5581f6..49a868c45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>27</version>
+ <version>28</version>
</parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
@@ -85,21 +85,21 @@
<wicketstuff.version>9.12.0</wicketstuff.version>
<wicket-bootstrap.version>6.0.0-M8</wicket-bootstrap.version>
<font-awesome.version>6.2.0</font-awesome.version>
- <spring.version>5.3.23</spring.version>
- <tomcat.version>9.0.68</tomcat.version>
- <ical4j.version>4.0.0-beta3</ical4j.version>
+ <spring.version>5.3.24</spring.version>
+ <tomcat.version>9.0.69</tomcat.version>
+ <ical4j.version>4.0.0-beta4</ical4j.version>
<cxf.version>3.5.4</cxf.version>
<io.prometheus.version>0.16.0</io.prometheus.version>
<aspectjtools.version>1.9.9.1</aspectjtools.version>
<simple-xml.version>2.7.1</simple-xml.version>
- <jettison.version>1.5.1</jettison.version>
+ <jettison.version>1.5.2</jettison.version>
<site.basedir>${project.basedir}</site.basedir>
<src.pack.skip>false</src.pack.skip>
<h2.version>2.1.214</h2.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<jakarta.mail.version>2.0.1</jakarta.mail.version>
<openjpa.version>3.2.2</openjpa.version>
- <asterisk-java.version>3.34.0</asterisk-java.version>
+ <asterisk-java.version>3.36.0</asterisk-java.version>
<commons-dbcp.version>2.9.0</commons-dbcp.version>
<commons-pool2.version>2.11.1</commons-pool2.version>
<commons-cli.version>1.5.0</commons-cli.version>
@@ -116,23 +116,23 @@
<caldav4j.version>1.0.5</caldav4j.version>
<tika-parsers.version>2.6.0</tika-parsers.version>
<commons-text.version>1.10.0</commons-text.version>
- <slf4j.version>2.0.3</slf4j.version>
- <logback.version>1.4.4</logback.version>
+ <slf4j.version>2.0.4</slf4j.version>
+ <logback.version>1.4.5</logback.version>
<jetty.version>9.4.49.v20220914</jetty.version>
<license.excludedScopes>test</license.excludedScopes>
<bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
- <mockito.version>4.8.1</mockito.version>
+ <mockito.version>4.9.0</mockito.version>
<quartz.version>2.3.2</quartz.version>
<kurento.version>6.18.0</kurento.version>
<jain-sip.version>1.2.307</jain-sip.version><!-- other versions are broken! -->
<jasny-bootstrap.version>3.1.3-2</jasny-bootstrap.version>
<jodconverter.version>4.4.4</jodconverter.version>
- <jaxb-runtime.version>2.3.5</jaxb-runtime.version>
+ <jaxb-runtime.version>2.3.7</jaxb-runtime.version>
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
<jquery-ui-touch-punch.version>0.2.3-2</jquery-ui-touch-punch.version>
<apacheds-test-framework.version>2.0.0.AM26</apacheds-test-framework.version>
- <swagger.version>2.2.6</swagger.version>
- <bytebuddy.version>1.12.18</bytebuddy.version>
+ <swagger.version>2.2.7</swagger.version>
+ <bytebuddy.version>1.12.19</bytebuddy.version>
<annotation-api.version>1.3.2</annotation-api.version>
<jsr305.version>3.0.2</jsr305.version>
<!-- Exclude all generated code -->