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 5071469 [OPENMEETINGS-2051] tika, cxf and plugins are updated
5071469 is described below
commit 507146935da8b4118b7d4f6f516a945ad3ef7ec7
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Mon May 20 10:12:36 2019 +0700
[OPENMEETINGS-2051] tika, cxf and plugins are updated
---
.../apache/openmeetings/core/ldap/LdapLoginManager.java | 2 +-
.../apache/openmeetings/backup/converter/WbConverter.java | 2 +-
pom.xml | 14 +++++++-------
3 files changed, 9 insertions(+), 9 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 7dc81a5..49a9fdf 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
@@ -384,7 +384,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-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java
index aaf0aac..4f73a1d 100644
---
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java
+++
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java
@@ -39,7 +39,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang3.math.NumberUtils;
import org.apache.openmeetings.db.dto.room.Whiteboard;
import org.apache.openmeetings.db.entity.file.BaseFileItem;
import org.apache.openmeetings.db.entity.file.FileItem;
diff --git a/pom.xml b/pom.xml
index 70219fc..b8cd75b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,15 +44,15 @@
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<minify-maven-plugin.version>1.7.6</minify-maven-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
- <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
+ <maven-source-plugin.version>3.1.0</maven-source-plugin.version>
<checksum-maven-plugin.version>1.8</checksum-maven-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<license-maven-plugin.version>1.16</license-maven-plugin.version>
- <reflow-maven-skin.version>2.0.0</reflow-maven-skin.version>
+ <reflow-maven-skin.version>2.0.2</reflow-maven-skin.version>
<reflow-theme>cerulean</reflow-theme>
-
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
- <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
+ <maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
<maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
<maven-bundle-plugin.version>4.1.0</maven-bundle-plugin.version>
@@ -81,7 +81,7 @@
<mina.version>2.1.2</mina.version>
<tomcat.version>9.0.20</tomcat.version>
<ical4j.version>3.0.6</ical4j.version>
- <cxf.version>3.3.1</cxf.version>
+ <cxf.version>3.3.2</cxf.version>
<selenium.version>3.141.59</selenium.version>
<simple-xml.version>2.7.1</simple-xml.version>
<jettison.version>1.4.0</jettison.version>
@@ -103,9 +103,9 @@
<mssql.version>7.2.2.jre11</mssql.version>
<commons-collections4.version>4.3</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.AM3</api-all.version>
<caldav4j.version>1.0.0-rc.2</caldav4j.version>
- <tika-parsers.version>1.20</tika-parsers.version>
+ <tika-parsers.version>1.21</tika-parsers.version>
<commons-text.version>1.6</commons-text.version>
<slf4j.version>1.7.26</slf4j.version>
<logback.version>1.2.3</logback.version>
