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 2018/07/15 09:54:37 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1897] library
versions are updated
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 521783b [OPENMEETINGS-1897] library versions are updated
521783b is described below
commit 521783bc34c6509eb8e1007f1ddab0d7460ec7c7
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sun Jul 15 16:45:01 2018 +0700
[OPENMEETINGS-1897] library versions are updated
---
openmeetings-db/pom.xml | 5 +++++
.../org/apache/openmeetings/web/common/MainPanel.java | 4 ++--
.../java/org/apache/openmeetings/web/pages/MainPage.java | 6 ++----
.../apache/openmeetings/webservice/TestUserService.java | 3 ++-
pom.xml | 16 ++++++++--------
5 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml
index ae8f214..3ea149b 100644
--- a/openmeetings-db/pom.xml
+++ b/openmeetings-db/pom.xml
@@ -107,6 +107,11 @@
<version>${postgresql.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>${mina.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-util</artifactId>
<version>${project.version}</version>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index 30d2770..15df522 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -126,8 +126,8 @@ public class MainPanel extends Panel {
private static final long serialVersionUID = 1L;
@Override
- public void renderHead(Component component, IHeaderResponse response) {
- super.renderHead(component, response);
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
StringBuilder handlers = new StringBuilder()
.append("Wicket.Event.subscribe(Wicket.Event.Topic.AJAX_CALL_FAILURE, hideBusyIndicator);")
.append("Wicket.Event.subscribe(Wicket.Event.Topic.AJAX_CALL_BEFORE, showBusyIndicator);")
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
index cbeb4cd..db1cada 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
@@ -18,8 +18,6 @@
*/
package org.apache.openmeetings.web.pages;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
-
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.MainPanel;
import org.apache.openmeetings.web.util.OmUrlFragment;
@@ -34,13 +32,13 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.EmptyPanel;
import org.apache.wicket.request.IRequestParameters;
-import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@AuthorizeInstantiation({"Admin", "Dashboard", "Room"})
public class MainPage extends BaseInitedPage {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(MainPage.class, getWebAppRootKey());
+ private static final Logger log = LoggerFactory.getLogger(MainPage.class);
private static final String MAIN_PANEL_ID = "main";
private final WebMarkupContainer mainContainer = new WebMarkupContainer("main-container");
private final AbstractDefaultAjaxBehavior areaBehavior = new AbstractDefaultAjaxBehavior() {
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java
index d51f87a..bbe326a 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java
@@ -38,6 +38,7 @@ import java.util.UUID;
import javax.ws.rs.core.Form;
import javax.ws.rs.core.Response;
+import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.dto.basic.ServiceResult;
import org.apache.openmeetings.db.dto.basic.ServiceResult.Type;
import org.apache.openmeetings.db.dto.room.RoomOptionsDTO;
@@ -113,7 +114,7 @@ public class TestUserService extends AbstractWebServiceTest {
assertTrue("Login via secure hash should be successful", ws.isSignedIn());
Long userId1 = WebSession.getUserId();
assertNotEquals(userId0, userId1);
- User u = userDao.get(userId1);
+ User u = getBean(UserDao.class).get(userId1);
assertNotNull("User should be created successfuly", u);
assertEquals("Picture URL should be preserved", DUMMY_PICTURE_URL, u.getPictureuri());
}
diff --git a/pom.xml b/pom.xml
index 35d9a99..8c5381e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>19</version>
+ <version>20</version>
</parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
@@ -47,8 +47,8 @@
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
<checksum-maven-plugin.version>1.6</checksum-maven-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
- <license-maven-plugin.version>1.14</license-maven-plugin.version>
- <reflow-skin.version>1.3.9-SNAPSHOT</reflow-skin.version>
+ <license-maven-plugin.version>1.16</license-maven-plugin.version>
+ <reflow-skin.version>1.3.10</reflow-skin.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>
<maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
@@ -74,12 +74,12 @@
<wicket.version>8.0.0</wicket.version>
<wicketju.version>8.0.0</wicketju.version>
<wickets.version>8.0.0</wickets.version>
- <red5-client.version>1.0.10-M8</red5-client.version>
+ <red5-client.version>1.0.10-M9</red5-client.version>
<spring.version>4.3.18.RELEASE</spring.version>
- <mina.version>2.0.18</mina.version>
+ <mina.version>2.0.19</mina.version>
<tomcat.version>9.0.8</tomcat.version>
<ical4j.version>2.2.0</ical4j.version>
- <cxf.version>3.2.4</cxf.version>
+ <cxf.version>3.2.5</cxf.version>
<selenium.version>3.12.0</selenium.version>
<simple-xml.version>2.7.1</simple-xml.version>
<jettison.version>1.4.0</jettison.version>
@@ -92,7 +92,7 @@
<asterisk-java.version>2.0.2</asterisk-java.version>
<commons-dbcp.version>2.4.0</commons-dbcp.version>
<commons-pool.version>1.6</commons-pool.version> <!-- required by OpenJPA for clustering -->
- <commons-pool2.version>2.5.0</commons-pool2.version>
+ <commons-pool2.version>2.6.0</commons-pool2.version>
<postgresql.version>42.2.2</postgresql.version>
<commons-cli.version>1.4</commons-cli.version>
<dom4j.version>2.1.0</dom4j.version>
@@ -100,7 +100,7 @@
<commons-io.version>2.6</commons-io.version>
<mysql.version>8.0.11</mysql.version>
<mssql.version>6.2.1.jre8</mssql.version>
- <pdfbox.version>2.0.10</pdfbox.version>
+ <pdfbox.version>2.0.11</pdfbox.version>
<commons-collections4.version>4.1</commons-collections4.version>
<xstream.version>1.4.10</xstream.version>
<api-all.version>1.0.2</api-all.version>