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 d22c4db7e [OPENMEETINGS-2770] jacoco, tomcat, tika, jaxb-runtime,
apacheds-test and swagger
d22c4db7e is described below
commit d22c4db7ef2c965fcc4d08adea517aeeccb26078
Author: Maxim Solodovnik <solo...@apache.org>
AuthorDate: Sun Oct 22 16:44:30 2023 +0700
[OPENMEETINGS-2770] jacoco, tomcat, tika, jaxb-runtime, apacheds-test and
swagger
---
.../apache/openmeetings/db/dao/TestMessageDao.java | 6 +-
.../ldap/CreateLdapServerExtension.java | 67 ----------------------
.../org/apache/openmeetings/ldap/TestLdap.java | 28 +++++++--
pom.xml | 12 ++--
4 files changed, 31 insertions(+), 82 deletions(-)
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestMessageDao.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestMessageDao.java
index 6b8f5198b..67a0e8b66 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestMessageDao.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestMessageDao.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.db.dao;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import java.util.List;
@@ -41,7 +41,7 @@ public class TestMessageDao extends AbstractOmServerTest {
User u2 = createUser();
List<PrivateMessageFolder> folders =
msgFolderDao.getByUser(u2.getId());
- assertFalse("Folders of first user shouldn't be visible to
second one"
- , folders.stream().anyMatch(fld ->
fldId.equals(fld.getId())));
+ assertFalse(folders.stream().anyMatch(fld ->
fldId.equals(fld.getId()))
+ , "Folders of first user shouldn't be visible
to second one");
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/CreateLdapServerExtension.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/CreateLdapServerExtension.java
deleted file mode 100644
index 5d35c227a..000000000
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/CreateLdapServerExtension.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.ldap;
-
-import java.lang.reflect.AnnotatedElement;
-
-import org.apache.directory.api.util.FileUtils;
-import org.apache.directory.server.core.api.DirectoryService;
-import org.apache.directory.server.core.factory.DSAnnotationProcessor;
-import org.apache.directory.server.factory.ServerAnnotationProcessor;
-import org.apache.directory.server.ldap.LdapServer;
-import org.junit.jupiter.api.extension.AfterAllCallback;
-import org.junit.jupiter.api.extension.BeforeAllCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.runner.Description;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CreateLdapServerExtension implements BeforeAllCallback,
AfterAllCallback {
- private static final Logger log =
LoggerFactory.getLogger(CreateLdapServerExtension.class);
- private DirectoryService directoryService;
- private LdapServer ldapServer;
-
- @Override
- public void afterAll(ExtensionContext context) throws Exception {
- log.trace("Stopping ldap server");
- ldapServer.stop();
-
- log.trace("Shutting down directory service");
- directoryService.shutdown();
-
FileUtils.deleteDirectory(directoryService.getInstanceLayout().getInstanceDirectory());
- }
-
- @Override
- public void beforeAll(ExtensionContext context) throws Exception {
- if (context.getElement().isPresent()) {
- AnnotatedElement e = context.getElement().get();
- Description description =
Description.createSuiteDescription("LDAP", e.getAnnotations());
- log.trace("Creating directory service");
- directoryService =
DSAnnotationProcessor.getDirectoryService(description);
- DSAnnotationProcessor.applyLdifs(description,
directoryService);
-
- log.trace("Creating ldap server");
- ldapServer =
ServerAnnotationProcessor.createLdapServer(description, directoryService);
- }
- }
-
- public LdapServer getLdapServer() {
- return ldapServer;
- }
-}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/TestLdap.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/TestLdap.java
index 0f4e9984f..70206019a 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/TestLdap.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/TestLdap.java
@@ -51,6 +51,9 @@ import
org.apache.directory.server.annotations.CreateTransport;
import org.apache.directory.server.core.annotations.ApplyLdifFiles;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.annotations.CreatePartition;
+import org.apache.directory.server.core.api.DirectoryService;
+import org.apache.directory.server.core.integ.ApacheDSTestExtension;
+import org.apache.directory.server.ldap.LdapServer;
import org.apache.directory.server.protocol.shared.transport.Transport;
import org.apache.openmeetings.AbstractWicketTesterTest;
import org.apache.openmeetings.core.ldap.LdapLoginManager;
@@ -62,16 +65,17 @@ import org.apache.openmeetings.web.app.WebSession;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
+@ExtendWith(ApacheDSTestExtension.class)
@CreateDS(name = "omDS",
partitions = {
@CreatePartition(name = "test", suffix =
"dc=test,dc=openmeetings,dc=apache,dc=org")
})
@CreateLdapServer(transports = { @CreateTransport(protocol = "LDAP", address =
"localhost")})
@ApplyLdifFiles({"schema/users.ldif"})
-class TestLdap extends AbstractWicketTesterTest {
+public class TestLdap extends AbstractWicketTesterTest {
private static final String CFG_SEARCH_BIND =
UUID.randomUUID().toString();
private static final String BAD_PASSWORD = "bad password";
private static final String USER1 = "ldaptest1";
@@ -79,16 +83,28 @@ class TestLdap extends AbstractWicketTesterTest {
private static final String USER3 = "ldaptest3";
private static final Map<String, LdapConfig> CFG_MAP = new HashMap<>();
private static final Properties PROPS = new Properties();
+ /** The class DirectoryService instance */
+ public static DirectoryService classDirectoryService;
+ /** The test DirectoryService instance */
+ public static DirectoryService methodDirectoryService;
+ /** The current DirectoryService instance */
+ public static DirectoryService directoryService;
+ /** The class LdapServer instance */
+ public static LdapServer classLdapServer;
+ /** The test LdapServer instance */
+ public static LdapServer methodLdapServer;
+ /** The current LdapServer instance */
+ public static LdapServer ldapServer;
+ /** The current revision */
+ public static long revision = 0L;
+
@Autowired
private LdapConfigDao ldapDao;
- @RegisterExtension
- public static CreateLdapServerExtension serverExtension = new
CreateLdapServerExtension();
-
@BeforeAll
public static void prepare() {
loadLdapConf("om_ldap.cfg", PROPS);
- Transport t =
serverExtension.getLdapServer().getTransports()[0];
+ Transport t = classLdapServer.getTransports()[0];
PROPS.put(CONFIGKEY_LDAP_HOST, t.getAddress());
PROPS.put(CONFIGKEY_LDAP_PORT, String.valueOf(t.getPort()));
PROPS.put(CONFIGKEY_LDAP_ADMIN_DN, ADMIN_SYSTEM_DN);
diff --git a/pom.xml b/pom.xml
index 456a9d279..e0977351a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
<keytool-maven-plugin.version>1.7</keytool-maven-plugin.version>
<maven-jarsigner-plugin.version>3.0.0</maven-jarsigner-plugin.version>
<sonar-maven-plugin.version>3.10.0.2594</sonar-maven-plugin.version>
-
<jacoco-maven-plugin.versoin>0.8.10</jacoco-maven-plugin.versoin>
+
<jacoco-maven-plugin.versoin>0.8.11</jacoco-maven-plugin.versoin>
<forbiddenapis.version>3.6</forbiddenapis.version>
<frontend-maven-plugin.version>1.14.0</frontend-maven-plugin.version>
<swagger-plugin.version>2.1.6</swagger-plugin.version>
@@ -89,7 +89,7 @@
<wicketstuff.version>9.15.0</wicketstuff.version>
<wicket-bootstrap.version>6.0.5</wicket-bootstrap.version>
<spring.version>5.3.30</spring.version>
- <tomcat.version>9.0.80</tomcat.version>
+ <tomcat.version>9.0.82</tomcat.version>
<ical4j.version>4.0.0-beta9</ical4j.version>
<cxf.version>3.6.2</cxf.version>
<io.prometheus.version>0.16.0</io.prometheus.version>
@@ -119,7 +119,7 @@
<xstream.version>1.4.20</xstream.version>
<api-all.version>2.1.5</api-all.version>
<caldav4j.version>1.0.5</caldav4j.version>
- <tika-parsers.version>2.9.0</tika-parsers.version>
+ <tika-parsers.version>2.9.1</tika-parsers.version>
<slf4j.version>2.0.9</slf4j.version>
<logback.version>1.4.11</logback.version>
<jetty.version>9.4.53.v20231009</jetty.version>
@@ -131,11 +131,11 @@
<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.6</jodconverter.version>
- <jaxb-runtime.version>2.3.8</jaxb-runtime.version>
+ <jaxb-runtime.version>2.3.9</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.16</swagger.version>
+
<apacheds-test-framework.version>2.0.0.AM27</apacheds-test-framework.version>
+ <swagger.version>2.2.17</swagger.version>
<bytebuddy.version>1.14.9</bytebuddy.version>
<annotation-api.version>1.3.2</annotation-api.version>
<jsr305.version>3.0.2</jsr305.version>
