[openmeetings] branch master updated: [OPENMEETINGS-2051] red5 version is updated

[solomax]

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 a7fdc83  [OPENMEETINGS-2051] red5 version is updated
a7fdc83 is described below

commit a7fdc8331d416be11f19d91197d3991c49912aca
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Tue Apr 23 23:28:35 2019 +0700

    [OPENMEETINGS-2051] red5 version is updated
---
 .../org/apache/openmeetings/webservice/AbstractWebServiceTest.java | 7 -------
 pom.xml                                                            | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java
 
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java
index 2ec184c..cada04b 100644
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java
@@ -26,8 +26,6 @@ import static 
org.apache.openmeetings.AbstractJUnitDefaults.soapUsername;
 import static org.apache.openmeetings.AbstractJUnitDefaults.userpass;
 import static 
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
 import static org.apache.openmeetings.util.OmFileHelper.getOmHome;
-import static 
org.apache.openmeetings.web.pages.install.TestInstall.resetDerbyHome;
-import static 
org.apache.openmeetings.web.pages.install.TestInstall.setDerbyHome;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -64,7 +62,6 @@ import 
org.apache.openmeetings.webservice.util.AppointmentMessageBodyReader;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.io.TempDir;
 
 public class AbstractWebServiceTest {
        private static Tomcat tomcat;
@@ -76,8 +73,6 @@ public class AbstractWebServiceTest {
        private static final String FILE_SERVICE_MOUNT = "file";
        public static final String UNIT_TEST_EXT_TYPE = "om_unit_tests";
        public static final long TIMEOUT = 5 * 60 * 1000;
-       @TempDir
-       static File tempFolder;
 
        protected static <T> T getBean(Class<T> clazz) {
                return ensureApplication().getBean(clazz);
@@ -111,7 +106,6 @@ public class AbstractWebServiceTest {
        @BeforeAll
        public static void initialize() throws Exception {
                AbstractSpringTest.init();
-               setDerbyHome(tempFolder);
                tomcat = new Tomcat();
                Connector connector = new Connector("HTTP/1.1");
                connector.setAttribute("address", 
InetAddress.getByName(HOST).getHostAddress());
@@ -142,7 +136,6 @@ public class AbstractWebServiceTest {
                        }
                        tomcat.destroy();
                }
-               resetDerbyHome();
        }
 
        protected static CallResult<RoomDTO> createAndValidate(RoomDTO r) {
diff --git a/pom.xml b/pom.xml
index bf1ad29..ca9544d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
                <wicket.version>9.0.0-M1</wicket.version>
                <wicketju.version>9.0.0-SNAPSHOT</wicketju.version>
                <wickets.version>9.0.0-M1</wickets.version>
-               <red5-client.version>1.0.10</red5-client.version>
+               <red5-client.version>1.1.0</red5-client.version>
                <spring.version>5.1.6.RELEASE</spring.version>
                <mina.version>2.1.1</mina.version>
                <tomcat.version>9.0.19</tomcat.version>