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 2019/01/31 16:35:24 UTC

[openmeetings] branch master updated: [OPENMEETINGS-1975] libraries 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 dac8dd4  [OPENMEETINGS-1975] libraries are updated
dac8dd4 is described below

commit dac8dd4ae9b7e5930d51eeca4a34f85652933b64
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Jan 31 23:27:25 2019 +0700

    [OPENMEETINGS-1975] libraries are updated
---
 .../src/site/xdoc/BuildInstructions.xml            |  2 +-
 openmeetings-server/src/site/xdoc/downloads.xml    | 25 ----------------------
 pom.xml                                            | 12 +++++------
 3 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/openmeetings-server/src/site/xdoc/BuildInstructions.xml b/openmeetings-server/src/site/xdoc/BuildInstructions.xml
index 6865c5d..2628b6f 100644
--- a/openmeetings-server/src/site/xdoc/BuildInstructions.xml
+++ b/openmeetings-server/src/site/xdoc/BuildInstructions.xml
@@ -58,7 +58,7 @@
 			<source>mvn versions:display-property-updates</source>
 		</section>
 		<section name="Check dependencies">
-			<source>mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.0:analyze-only</source>
+			<source>mvn org.apache.maven.plugins:maven-dependency-plugin:analyze-only</source>
 		</section>
 		<section name="Tips and Gotchas">
 			<p>Eclipse ANSI colors plugin for colors in console</p>
diff --git a/openmeetings-server/src/site/xdoc/downloads.xml b/openmeetings-server/src/site/xdoc/downloads.xml
index dc53fa4..a0fe5cd 100644
--- a/openmeetings-server/src/site/xdoc/downloads.xml
+++ b/openmeetings-server/src/site/xdoc/downloads.xml
@@ -73,31 +73,6 @@
 					<li>
 						<a href="https://cwiki.apache.org/confluence/display/OPENMEETINGS/Live+iso+OpenMeetings+on+Ubuntu">Live OM iso images by Alvaro</a>
 					</li>
-					<li>
-						ISO: <a href="https://om.alteametasoft.com/om_4.0.7.qcow2">https://om.alteametasoft.com/om_4.0.7.qcow2</a> (QEMU qcow2 format)
-						<source>
-<![CDATA[
-#######      PLEASE CHANGE ALL PASSWORDS !!
-system:            user/pass
-SSH user:      om_admin/12345
-MySql root:        root/12345
-MySql user:    om_admin/12345
-OM:            om_admin/1Q2w3e4r5t^y
-#######      PLEASE CHANGE ALL PASSWORDS !!
-
-# run
-#   memory          ==: "-m 2G"
-#   number of cores ==: "-smp 1"
-qemu-system-x86_64 -boot d -smp 1 -m 2G -drive format=qcow2,file=om_4.0.7.qcow2 -net user,hostfwd=tcp::10022-:22,hostfwd=tcp::15080-:5080 -net nic
-
-# connect
-ssh om_admin@localhost -p10022
-
-# OM URL
-http://localhost:15080/openmeetings
-]]>
-						</source>
-					</li>
 				</ul>
 			</subsection>
 			<subsection name="Previous Official Releases">
diff --git a/pom.xml b/pom.xml
index ed6149b..904ea72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,12 +76,12 @@
 		<wicket.version>8.3.0-SNAPSHOT</wicket.version>
 		<wicketju.version>8.1.0</wicketju.version>
 		<wickets.version>8.2.0</wickets.version>
-		<red5-client.version>1.0.10-M9</red5-client.version>
-		<spring.version>5.1.3.RELEASE</spring.version>
+		<red5-client.version>1.0.10-M10</red5-client.version>
+		<spring.version>5.1.4.RELEASE</spring.version>
 		<mina.version>2.0.19</mina.version>
 		<tomcat.version>9.0.14</tomcat.version>
-		<ical4j.version>3.0.4</ical4j.version>
-		<cxf.version>3.2.7</cxf.version>
+		<ical4j.version>3.0.6</ical4j.version>
+		<cxf.version>3.3.0</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>
@@ -104,7 +104,7 @@
 		<commons-collections4.version>4.2</commons-collections4.version>
 		<xstream.version>1.4.11.1</xstream.version>
 		<api-all.version>2.0.0.AM2</api-all.version>
-		<caldav4j.version>1.0.0-rc.1</caldav4j.version>
+		<caldav4j.version>1.0.0-rc.2</caldav4j.version>
 		<tika-parsers.version>1.20</tika-parsers.version>
 		<commons-text.version>1.6</commons-text.version>
 		<slf4j.version>1.7.25</slf4j.version>
@@ -113,7 +113,7 @@
 		<license.excludedScopes>test</license.excludedScopes>
 		<bcprov-jdk15on.version>1.60</bcprov-jdk15on.version>
 		<mockito.version>2.23.4</mockito.version>
-		<powermock.version>2.0.0-RC.4</powermock.version>
+		<powermock.version>2.0.0</powermock.version>
 		<!--  URL of the ASF SonarQube server  -->
 		<sonar.host.url>https://builds.apache.org/analysis</sonar.host.url>
 		<!--  Exclude all generated code  -->