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 d85df1a36 [OPENMEETINGS-2790] spring, jetty, prometheus, mssql driver,
mockito, jodconverter, swagger and plugings; tests were fixed to work with new
Mockito
d85df1a36 is described below
commit d85df1a36b9b6878cf78d9b3d90871227fc109ae
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Thu Aug 28 02:27:41 2025 +0700
[OPENMEETINGS-2790] spring, jetty, prometheus, mssql driver, mockito,
jodconverter, swagger and plugings; tests were fixed to work with new Mockito
---
LICENSE | 58 +++++++++++-----------
openmeetings-mediaserver/pom.xml | 4 ++
.../openmeetings/mediaserver/BaseMockedTest.java | 23 ++++++---
.../java/org/apache/openmeetings/test/Utils.java | 36 ++++++++++++++
openmeetings-web/pom.xml | 2 +-
.../openmeetings/web/AbstractOmServerTest.java | 12 +----
.../openmeetings/ws/AbstractWebServiceTest.java | 4 +-
pom.xml | 20 ++++----
8 files changed, 99 insertions(+), 60 deletions(-)
diff --git a/LICENSE b/LICENSE
index c66c76a79..5539c913a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -321,7 +321,7 @@ conditions of the following licenses.
* jsoup Java HTML Parser (org.jsoup:jsoup:1.21.1 - https://jsoup.org/)
* just-validate (org.webjars.npm:just-validate:4.3.0 -
https://www.webjars.org)
* lodash.merge (org.webjars.npm:lodash.merge:4.6.2 -
http://webjars.org)
- * Microsoft JDBC Driver for SQL Server
(com.microsoft.sqlserver:mssql-jdbc:12.10.1.jre11 -
https://github.com/Microsoft/mssql-jdbc)
+ * Microsoft JDBC Driver for SQL Server
(com.microsoft.sqlserver:mssql-jdbc:13.2.0.jre11 -
https://github.com/Microsoft/mssql-jdbc)
* minimasonry (org.webjars.npm:minimasonry:1.3.2 -
https://www.webjars.org)
* Modernizr (org.webjars:modernizr:2.8.3-1 - http://webjars.org)
* moment (org.webjars.npm:moment:2.30.1 - https://www.webjars.org)
@@ -436,8 +436,6 @@ conditions of the following licenses.
* bootstrap-core (de.agilecoders.wicket:wicket-bootstrap-core:7.0.11 -
https://github.com/l0rdn1kk0n/wicket-bootstrap/wicket-bootstrap-core)
* bootstrap-extensions
(de.agilecoders.wicket:wicket-bootstrap-extensions:7.0.11 -
https://github.com/l0rdn1kk0n/wicket-bootstrap/wicket-bootstrap-extensions)
* bootstrap-themes
(de.agilecoders.wicket:wicket-bootstrap-themes:7.0.11 -
https://github.com/l0rdn1kk0n/wicket-bootstrap/wicket-bootstrap-themes)
- * Byte Buddy (without dependencies) (net.bytebuddy:byte-buddy:1.14.1 -
https://bytebuddy.net/byte-buddy)
- * Byte Buddy (without dependencies) (net.bytebuddy:byte-buddy:1.15.11
- https://bytebuddy.net/byte-buddy)
* Byte Buddy (without dependencies) (net.bytebuddy:byte-buddy:1.17.6 -
https://bytebuddy.net/byte-buddy)
* Caffeine cache (com.github.ben-manes.caffeine:caffeine:2.9.3 -
https://github.com/ben-manes/caffeine)
* CalDav4j (com.github.caldav4j:caldav4j:1.0.5 -
https://github.com/caldav4j/caldav4j.git)
@@ -475,8 +473,8 @@ conditions of the following licenses.
* jcommander (com.beust:jcommander:1.72 - http://jcommander.org)
* JDOM (org.jdom:jdom2:2.0.6.1 - http://www.jdom.org)
* Jettison (org.codehaus.jettison:jettison:1.5.4 -
https://github.com/jettison-json/jettison)
- * JODConverter Core (org.jodconverter:jodconverter-core:4.4.10 -
https://github.com/jodconverter/jodconverter/)
- * JODConverter Local (org.jodconverter:jodconverter-local:4.4.10 -
https://github.com/jodconverter/jodconverter/)
+ * JODConverter Core (org.jodconverter:jodconverter-core:4.4.11 -
https://github.com/jodconverter/jodconverter/)
+ * JODConverter Local (org.jodconverter:jodconverter-local:4.4.11 -
https://github.com/jodconverter/jodconverter/)
* jqplot4java (org.wicketstuff:jqplot4java:10.6.0 -
http://maven.apache.org)
* JqPlot Plugin Integration (org.wicketstuff:jqplot:10.6.0 -
http://wicketstuff.org/jqplot-parent/jqplot)
* jwarc (org.netpreserve:jwarc:0.32.0 - https://github.com/iipc/jwarc)
@@ -485,8 +483,8 @@ conditions of the following licenses.
* Kurento JSON-RPC Client (org.kurento:kurento-jsonrpc-client:7.2.0 -
https://kurento.openvidu.io/kurento-jsonrpc/kurento-jsonrpc-client/)
* library (de.agilecoders.wicket.webjars:wicket-webjars:4.0.8 -
https://github.com/l0rdn1kk0n/wicket-webjars/wicket-webjars)
* Log4j Implemented Over SLF4J (org.slf4j:log4j-over-slf4j:2.0.17 -
http://www.slf4j.org)
- * micrometer-commons (io.micrometer:micrometer-commons:1.14.9 -
https://github.com/micrometer-metrics/micrometer)
- * micrometer-observation (io.micrometer:micrometer-observation:1.14.9
- https://github.com/micrometer-metrics/micrometer)
+ * micrometer-commons (io.micrometer:micrometer-commons:1.14.10 -
https://github.com/micrometer-metrics/micrometer)
+ * micrometer-observation (io.micrometer:micrometer-observation:1.14.10
- https://github.com/micrometer-metrics/micrometer)
* Netty/Buffer (io.netty:netty-buffer:4.1.85.Final -
https://netty.io/netty-buffer/)
* Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.85.Final -
https://netty.io/netty-codec-http/)
* Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.85.Final -
https://netty.io/netty-codec-socks/)
@@ -515,34 +513,34 @@ conditions of the following licenses.
* parso (com.epam:parso:2.0.14 - https://github.com/epam/parso)
* PDFBox JBIG2 ImageIO plugin (org.apache.pdfbox:jbig2-imageio:3.0.4 -
https://www.apache.org/jbig2-imageio/)
* picocli (info.picocli:picocli:4.7.6 - https://picocli.info)
- * Prometheus Metrics Config
(io.prometheus:prometheus-metrics-config:1.3.10 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-config)
- * Prometheus Metrics Core
(io.prometheus:prometheus-metrics-core:1.3.10 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-core)
- * Prometheus Metrics Exporter - Common
(io.prometheus:prometheus-metrics-exporter-common:1.3.10 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-exporter-common)
- * Prometheus Metrics Exporter - Servlet Jakarta
(io.prometheus:prometheus-metrics-exporter-servlet-jakarta:1.3.10 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-exporter-servlet-jakarta)
- * Prometheus Metrics Exposition Formats
(io.prometheus:prometheus-metrics-exposition-formats:1.3.10 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-exposition-formats)
- * Prometheus Metrics Exposition Text Formats
(io.prometheus:prometheus-metrics-exposition-textformats:1.3.10 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-exposition-textformats)
- * Prometheus Metrics Model
(io.prometheus:prometheus-metrics-model:1.3.10 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-model)
- * Prometheus Metrics Tracer Common
(io.prometheus:prometheus-metrics-tracer-common:1.3.10 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-common)
- * Prometheus Metrics Tracer Initializer
(io.prometheus:prometheus-metrics-tracer-initializer:1.3.10 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-initializer)
- * Prometheus Metrics Tracer OpenTelemetry
(io.prometheus:prometheus-metrics-tracer-otel:1.3.10 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-otel)
- * Prometheus Metrics Tracer OpenTelemetry Agent
(io.prometheus:prometheus-metrics-tracer-otel-agent:1.3.10 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent)
+ * Prometheus Metrics Config
(io.prometheus:prometheus-metrics-config:1.4.1 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-config)
+ * Prometheus Metrics Core (io.prometheus:prometheus-metrics-core:1.4.1
- http://github.com/prometheus/client_java/client_java/prometheus-metrics-core)
+ * Prometheus Metrics Exporter - Common
(io.prometheus:prometheus-metrics-exporter-common:1.4.1 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-exporter-common)
+ * Prometheus Metrics Exporter - Servlet Jakarta
(io.prometheus:prometheus-metrics-exporter-servlet-jakarta:1.4.1 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-exporter-servlet-jakarta)
+ * Prometheus Metrics Exposition Formats
(io.prometheus:prometheus-metrics-exposition-formats:1.4.1 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-exposition-formats)
+ * Prometheus Metrics Exposition Text Formats
(io.prometheus:prometheus-metrics-exposition-textformats:1.4.1 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-exposition-textformats)
+ * Prometheus Metrics Model
(io.prometheus:prometheus-metrics-model:1.4.1 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-model)
+ * Prometheus Metrics Tracer Common
(io.prometheus:prometheus-metrics-tracer-common:1.4.1 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-common)
+ * Prometheus Metrics Tracer Initializer
(io.prometheus:prometheus-metrics-tracer-initializer:1.4.1 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-initializer)
+ * Prometheus Metrics Tracer OpenTelemetry
(io.prometheus:prometheus-metrics-tracer-otel:1.4.1 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-otel)
+ * Prometheus Metrics Tracer OpenTelemetry Agent
(io.prometheus:prometheus-metrics-tracer-otel-agent:1.4.1 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent)
* quartz (org.quartz-scheduler:quartz:2.5.0 -
https://www.quartz-scheduler.org/)
* Reflections (org.reflections:reflections:0.10.2 -
http://github.com/ronmamo/reflections)
* rome (com.rometools:rome:2.1.0 - http://rometools.com/rome)
* rome-utils (com.rometools:rome-utils:2.1.0 -
http://rometools.com/rome-utils)
* SparseBitSet (com.zaxxer:SparseBitSet:1.3 -
https://github.com/brettwooldridge/SparseBitSet)
- * Spring AOP (org.springframework:spring-aop:6.2.9 -
https://github.com/spring-projects/spring-framework)
- * Spring Beans (org.springframework:spring-beans:6.2.9 -
https://github.com/spring-projects/spring-framework)
- * Spring Context (org.springframework:spring-context:6.2.9 -
https://github.com/spring-projects/spring-framework)
- * Spring Context Support
(org.springframework:spring-context-support:6.2.9 -
https://github.com/spring-projects/spring-framework)
- * Spring Core (org.springframework:spring-core:6.2.9 -
https://github.com/spring-projects/spring-framework)
- * Spring Expression Language (SpEL)
(org.springframework:spring-expression:6.2.9 -
https://github.com/spring-projects/spring-framework)
- * Spring JDBC (org.springframework:spring-jdbc:6.2.9 -
https://github.com/spring-projects/spring-framework)
- * Spring Object/Relational Mapping
(org.springframework:spring-orm:6.2.9 -
https://github.com/spring-projects/spring-framework)
- * Spring Transaction (org.springframework:spring-tx:6.2.9 -
https://github.com/spring-projects/spring-framework)
- * Spring Web (org.springframework:spring-web:6.2.9 -
https://github.com/spring-projects/spring-framework)
- * Spring Web MVC (org.springframework:spring-webmvc:6.2.9 -
https://github.com/spring-projects/spring-framework)
- * swagger-annotations (io.swagger.core.v3:swagger-annotations:2.2.35 -
https://github.com/swagger-api/swagger-core/modules/swagger-annotations)
+ * Spring AOP (org.springframework:spring-aop:6.2.10 -
https://github.com/spring-projects/spring-framework)
+ * Spring Beans (org.springframework:spring-beans:6.2.10 -
https://github.com/spring-projects/spring-framework)
+ * Spring Context (org.springframework:spring-context:6.2.10 -
https://github.com/spring-projects/spring-framework)
+ * Spring Context Support
(org.springframework:spring-context-support:6.2.10 -
https://github.com/spring-projects/spring-framework)
+ * Spring Core (org.springframework:spring-core:6.2.10 -
https://github.com/spring-projects/spring-framework)
+ * Spring Expression Language (SpEL)
(org.springframework:spring-expression:6.2.10 -
https://github.com/spring-projects/spring-framework)
+ * Spring JDBC (org.springframework:spring-jdbc:6.2.10 -
https://github.com/spring-projects/spring-framework)
+ * Spring Object/Relational Mapping
(org.springframework:spring-orm:6.2.10 -
https://github.com/spring-projects/spring-framework)
+ * Spring Transaction (org.springframework:spring-tx:6.2.10 -
https://github.com/spring-projects/spring-framework)
+ * Spring Web (org.springframework:spring-web:6.2.10 -
https://github.com/spring-projects/spring-framework)
+ * Spring Web MVC (org.springframework:spring-webmvc:6.2.10 -
https://github.com/spring-projects/spring-framework)
+ * swagger-annotations (io.swagger.core.v3:swagger-annotations:2.2.36 -
https://github.com/swagger-api/swagger-core/modules/swagger-annotations)
* tomcat (org.apache.tomcat:tomcat:11.0.10 -
https://tomcat.apache.org/)
* UNO interface library (org.openoffice:unoil:4.1.2 -
https://wiki.openoffice.org/wiki/Uno)
* Wicket Auth Roles (org.apache.wicket:wicket-auth-roles:10.6.0 -
http://wicket.apache.org/wicket-auth-roles)
diff --git a/openmeetings-mediaserver/pom.xml b/openmeetings-mediaserver/pom.xml
index 16855e2eb..f2cf66e1a 100644
--- a/openmeetings-mediaserver/pom.xml
+++ b/openmeetings-mediaserver/pom.xml
@@ -45,6 +45,10 @@
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-db</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-tests</artifactId>
+ </dependency>
<dependency>
<groupId>org.kurento</groupId>
<artifactId>kurento-client</artifactId>
diff --git
a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/BaseMockedTest.java
b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/BaseMockedTest.java
index 08782b340..82bc3f175 100644
---
a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/BaseMockedTest.java
+++
b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/BaseMockedTest.java
@@ -19,6 +19,7 @@
*/
package org.apache.openmeetings.mediaserver;
+import static org.apache.openmeetings.test.Utils.getTestCoordinates;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyString;
@@ -42,7 +43,9 @@ import org.apache.openmeetings.db.entity.basic.IWsClient;
import org.apache.openmeetings.db.entity.label.OmLanguage;
import org.apache.openmeetings.db.util.ApplicationHelper;
import org.apache.wicket.injection.Injector;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.extension.ExtendWith;
import org.kurento.client.KurentoClient;
import org.kurento.client.MediaPipeline;
@@ -57,7 +60,7 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
-import org.mockito.Spy;
+import org.mockito.MockitoAnnotations;
import org.mockito.internal.configuration.injection.scanner.MockScanner;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.junit.jupiter.MockitoExtension;
@@ -75,29 +78,37 @@ class BaseMockedTest {
protected RomManager romManager;
@Mock
protected ServerManager kServerManager;
- @Spy
@InjectMocks
protected StreamProcessorActions streamProcessorActions;
@Mock
protected KurentoClient client;
- @Spy
@InjectMocks
protected StreamProcessor streamProcessor;
- @Spy
@InjectMocks
protected TestStreamProcessor testProcessor;
- @Spy
@InjectMocks
protected KurentoHandler handler;
@BeforeEach
- void baseSetup() {
+ void baseSetup(TestInfo testInfo) {
+ log.info("Test started: {} ---", getTestCoordinates(testInfo));
+ // @Spy + @InjectMocks are NOT supported
+ streamProcessorActions = Mockito.spy(new
StreamProcessorActions());
+ streamProcessor = Mockito.spy(new StreamProcessor());
+ testProcessor = Mockito.spy(new TestStreamProcessor());
+ handler = Mockito.spy(new KurentoHandler());
+ MockitoAnnotations.openMocks(this);
Mockito.reset();
lenient().doReturn(kServerManager).when(client).getServerManager();
lenient().doReturn(new
TransactionImpl(romManager)).when(client).beginTransaction();
handler.init();
}
+ @AfterEach
+ void tearDown(TestInfo testInfo) {
+ log.info(" --- test finished: {}",
getTestCoordinates(testInfo));
+ }
+
void mockWs(MockedStatic<WebSocketHelper> wsHelperMock) {
wsHelperMock.when(() ->
WebSocketHelper.sendClient(any(IWsClient.class),
any(JSONObject.class))).thenAnswer(new Answer<Void>() {
@Override
diff --git
a/openmeetings-tests/src/main/java/org/apache/openmeetings/test/Utils.java
b/openmeetings-tests/src/main/java/org/apache/openmeetings/test/Utils.java
new file mode 100644
index 000000000..7916b8a56
--- /dev/null
+++ b/openmeetings-tests/src/main/java/org/apache/openmeetings/test/Utils.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.test;
+
+import org.junit.jupiter.api.TestInfo;
+
+public class Utils {
+ private Utils() {}
+
+ public static String getTestCoordinates(TestInfo testInfo) {
+ String meth = testInfo.getTestMethod().map(m ->
m.getName()).orElse("method n/a");
+ String res = testInfo.getTestClass().map(c ->
c.getSimpleName()).orElse("class n/a") + ".";
+ if (testInfo.getDisplayName().contains(meth)) {
+ res += testInfo.getDisplayName();
+ } else {
+ res += meth + testInfo.getDisplayName();
+ }
+ return res;
+ }
+}
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 7ef8a0ade..dc8057678 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -516,7 +516,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-inline</artifactId>
+ <artifactId>mockito-core</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/AbstractOmServerTest.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/AbstractOmServerTest.java
index 90b6af6c2..4e417ebb7 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/AbstractOmServerTest.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/AbstractOmServerTest.java
@@ -20,6 +20,7 @@ package org.apache.openmeetings.web;
import static java.util.UUID.randomUUID;
import static
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
+import static org.apache.openmeetings.test.Utils.getTestCoordinates;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_CONTEXT_NAME;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.getCryptClassName;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.getWicketApplicationName;
@@ -94,17 +95,6 @@ public abstract class AbstractOmServerTest {
}
}
- public static String getTestCoordinates(TestInfo testInfo) {
- String meth = testInfo.getTestMethod().map(m ->
m.getName()).orElse("method n/a");
- String res = testInfo.getTestClass().map(c ->
c.getSimpleName()).orElse("class n/a") + ".";
- if (testInfo.getDisplayName().contains(meth)) {
- res += testInfo.getDisplayName();
- } else {
- res += meth + testInfo.getDisplayName();
- }
- return res;
- }
-
@BeforeEach
public void serverSetup(TestInfo testInfo) throws Exception {
if (app.getName() == null) {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/ws/AbstractWebServiceTest.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/AbstractWebServiceTest.java
index ba0f3232b..a35b5d6f6 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/ws/AbstractWebServiceTest.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/AbstractWebServiceTest.java
@@ -19,12 +19,12 @@
package org.apache.openmeetings.ws;
import static java.util.UUID.randomUUID;
+import static
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
+import static org.apache.openmeetings.test.Utils.getTestCoordinates;
import static org.apache.openmeetings.web.AbstractOmServerTest.createPass;
import static org.apache.openmeetings.web.AbstractOmServerTest.ensureSchema;
-import static
org.apache.openmeetings.web.AbstractOmServerTest.getTestCoordinates;
import static org.apache.openmeetings.web.AbstractOmServerTest.SOAP_USERNAME;
import static org.apache.openmeetings.web.AbstractOmServerTest.USER_PASS;
-import static
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/pom.xml b/pom.xml
index 45f8b469f..0efe1fcd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<minimalJavaBuildVersion>${jdk.version}</minimalJavaBuildVersion>
<!-- plugin versions -->
-
<version.maven-javadoc-plugin>3.11.2</version.maven-javadoc-plugin>
+
<version.maven-javadoc-plugin>3.11.3</version.maven-javadoc-plugin>
<version.maven-surefire>3.5.3</version.maven-surefire>
<version.maven-site-plugin>4.0.0-M9</version.maven-site-plugin>
<version.maven-enforcer-plugin>3.6.1</version.maven-enforcer-plugin>
@@ -91,12 +91,12 @@
<wicketstuff.version>10.6.0</wicketstuff.version>
<wicket-bootstrap.version>7.0.11</wicket-bootstrap.version>
<fullcalendar.version>6.1.15</fullcalendar.version>
- <spring.version>6.2.9</spring.version>
+ <spring.version>6.2.10</spring.version>
<tomcat.version>11.0.10</tomcat.version>
- <jetty.version>11.0.25</jetty.version>
+ <jetty.version>11.0.26</jetty.version>
<ical4j.version>4.1.1</ical4j.version>
<cxf.version>4.1.3</cxf.version>
- <io.prometheus.version>1.3.10</io.prometheus.version>
+ <io.prometheus.version>1.4.1</io.prometheus.version>
<aspectjtools.version>1.9.24</aspectjtools.version>
<simple-xml.version>2.7.1</simple-xml.version>
<jettison.version>1.5.4</jettison.version>
@@ -122,7 +122,7 @@
<dom4j.version>2.2.0</dom4j.version>
<postgresql.version>42.7.7</postgresql.version>
<mysql.version>9.4.0</mysql.version>
- <mssql.version>12.10.1.jre11</mssql.version>
+ <mssql.version>13.2.0.jre11</mssql.version>
<ojdbc.version>19.28.0.0</ojdbc.version>
<xstream.version>1.4.21</xstream.version>
<api-all.version>2.1.7</api-all.version>
@@ -133,17 +133,17 @@
<logback.version>1.5.18</logback.version>
<license.excludedScopes>test</license.excludedScopes>
<bcprov.version>1.81</bcprov.version>
- <mockito.version>5.2.0</mockito.version>
+ <mockito.version>5.19.0</mockito.version>
<quartz.version>2.5.0</quartz.version>
<kurento.version>7.2.0</kurento.version>
<gson.version>2.10</gson.version><!-- !!!! this whole
dependency should be dropped !!!! -->
<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.10</jodconverter.version>
+ <jodconverter.version>4.4.11</jodconverter.version>
<jaxb-runtime.version>4.0.5</jaxb-runtime.version>
<jquery-ui-touch-punch.version>0.2.3-2</jquery-ui-touch-punch.version>
<apacheds-test-framework.version>2.0.0.AM27</apacheds-test-framework.version>
- <swagger.version>2.2.35</swagger.version>
+ <swagger.version>2.2.36</swagger.version>
<jsr305.version>3.0.2</jsr305.version>
<totp.version>1.7.1</totp.version>
<!-- Exclude all generated code -->
@@ -1020,7 +1020,7 @@
<!-- TESTS -->
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-inline</artifactId>
+ <artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
@@ -1094,7 +1094,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-inline</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
