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/06/21 06:22:23 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2732] dependencies are cleaned-up, deprecated code removed
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 dcfe5c9e7 [OPENMEETINGS-2732] dependencies are cleaned-up, deprecated code removed
dcfe5c9e7 is described below
commit dcfe5c9e7a6709ee5f3fc5830f7a94240214efea
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue Jun 21 13:22:07 2022 +0700
[OPENMEETINGS-2732] dependencies are cleaned-up, deprecated code removed
---
openmeetings-core/pom.xml | 10 ++++++----
.../openmeetings/core/remote/BaseMockedTest.java | 3 ++-
openmeetings-web/pom.xml | 23 ----------------------
openmeetings-webservice/pom.xml | 12 -----------
4 files changed, 8 insertions(+), 40 deletions(-)
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 3cabb9d76..723b6f9e0 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -49,10 +49,6 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.apache.openmeetings</groupId>
- <artifactId>openmeetings-util</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-db</artifactId>
@@ -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 a19a3ca6d..b425e172b 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.Spy;
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 @@ public class BaseMockedTest {
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 33111bd45..500bd57ba 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>
@@ -486,26 +485,10 @@
</plugins>
</build>
<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>
@@ -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 ee5580ff3..8c8516d56 100644
--- a/openmeetings-webservice/pom.xml
+++ b/openmeetings-webservice/pom.xml
@@ -160,18 +160,6 @@
</plugins>
</build>
<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>