[OPENMEETINGS-2732] dependencies are cleaned-up, deprecated code removed
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 3cabb9d..723b6f9 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -51,10 +51,6 @@
<dependencies>
<dependency>
<groupId>org.apache.openmeetings</groupId>
- <artifactId>openmeetings-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-db</artifactId>
</dependency>
<dependency>
@@ -101,6 +97,12 @@
<groupId>javax.sip</groupId>
<artifactId>jain-sip-ri</artifactId>
</dependency>
+ <!-- FIXME TODO -->
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId> <!-- required for jakarta.mail -->
+ <version>2.0.1</version>
+ </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/BaseMockedTest.java b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/BaseMockedTest.java
index a19a3ca..b425e17 100644
--- a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/BaseMockedTest.java
+++ b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/BaseMockedTest.java
@@ -61,6 +61,7 @@
import org.mockito.internal.configuration.injection.scanner.MockScanner;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.quality.Strictness;
import org.mockito.stubbing.Answer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -124,7 +125,7 @@
labelMock.when(() -> LabelDao.getLanguage(any(Long.class))).thenReturn(new OmLanguage(1L, Locale.ENGLISH));
appHelpMock.when(() -> ApplicationHelper.ensureApplication(any(Long.class))).thenReturn(mock(IApplication.class));
- Injector injector = mock(Injector.class, withSettings().lenient());
+ Injector injector = mock(Injector.class, withSettings().strictness(Strictness.LENIENT));
doAnswer(new Answer<Void>() {
@Override
public Void answer(InvocationOnMock invocation) throws Throwable {
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 33111bd..500bd57 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -318,7 +318,6 @@
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>false</overWriteIfNewer>
- <excludeTransitive>false</excludeTransitive>
</configuration>
</execution>
<execution>
@@ -488,26 +487,10 @@
<dependencies>
<dependency>
<groupId>org.apache.openmeetings</groupId>
- <artifactId>openmeetings-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.openmeetings</groupId>
- <artifactId>openmeetings-db</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.openmeetings</groupId>
- <artifactId>openmeetings-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-install</artifactId>
</dependency>
<dependency>
<groupId>org.apache.openmeetings</groupId>
- <artifactId>openmeetings-service</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-webservice</artifactId>
</dependency>
<dependency>
@@ -586,12 +569,6 @@
<groupId>org.webjars</groupId>
<artifactId>jquery-ui-touch-punch</artifactId>
</dependency>
- <!-- FIXME TODO -->
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId> <!-- required for jakarta.mail -->
- <version>2.0.1</version>
- </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.apache.openmeetings</groupId>
diff --git a/openmeetings-webservice/pom.xml b/openmeetings-webservice/pom.xml
index ee5580f..8c8516d 100644
--- a/openmeetings-webservice/pom.xml
+++ b/openmeetings-webservice/pom.xml
@@ -162,18 +162,6 @@
<dependencies>
<dependency>
<groupId>org.apache.openmeetings</groupId>
- <artifactId>openmeetings-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.openmeetings</groupId>
- <artifactId>openmeetings-db</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.openmeetings</groupId>
- <artifactId>openmeetings-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-service</artifactId>
</dependency>
<dependency>
