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 4aa465a [OPENMEETINGS-2151] LDAp libs are updated
4aa465a is described below
commit 4aa465a945d2d3c845672c026d85a2d2fe6f940d
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Mar 10 15:41:59 2020 +0700
[OPENMEETINGS-2151] LDAp libs are updated
---
.../main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java | 2 +-
openmeetings-web/pom.xml | 2 +-
.../main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java | 2 +-
pom.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
index c3cca0d..7d530f4 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
@@ -383,7 +383,7 @@ public class LdapLoginManager {
Attribute attr = getAttr(config, entry,
CONFIGKEY_LDAP_KEY_GROUP, LDAP_KEY_GROUP);
if (attr != null) {
for (Value v : attr) {
- groups.add(new
Dn(v.getValue()));
+ groups.add(new
Dn(v.getString()));
}
}
} else if (GroupMode.QUERY == options.groupMode) {
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index df3154b..06d4401 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -691,7 +691,7 @@
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-test-framework</artifactId>
- <version>2.0.0.AM25</version>
+ <version>2.0.0.AM26</version>
<exclusions>
<exclusion>
<groupId>org.apache.directory.api</groupId>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
index ca1aade..8c20436 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
@@ -74,7 +74,7 @@ public class RoomMenuPanel extends Panel {
private final Button shareBtn;
private final Label roomName;
private static final FastDateFormat df =
FastDateFormat.getInstance("dd.MM.yyyy HH:mm");
- private final AjaxLink<Void> askBtn = new AjaxLink<Void>("ask") {
+ private final AjaxLink<Void> askBtn = new AjaxLink<>("ask") {
private static final long serialVersionUID = 1L;
@Override
diff --git a/pom.xml b/pom.xml
index 6e00e51..601f2cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
<mssql.version>8.2.1.jre11</mssql.version>
<commons-collections4.version>4.4</commons-collections4.version>
<xstream.version>1.4.11.1</xstream.version>
- <api-all.version>2.0.0.AM2</api-all.version>
+ <api-all.version>2.0.0</api-all.version>
<caldav4j.version>1.0.0-rc.2</caldav4j.version>
<tika-parsers.version>1.23</tika-parsers.version>
<commons-text.version>1.8</commons-text.version>
