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/10/15 14:03:07 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2093]
reflow-skin, spring, tomcat, ical4j, h2, bcprov,
mockito and kurento 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 5e7a1ab [OPENMEETINGS-2093] reflow-skin, spring, tomcat, ical4j, h2, bcprov, mockito and kurento are updated
5e7a1ab is described below
commit 5e7a1ab0fcb2b15953e4df146bd65fd4363ce931
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue Oct 15 21:02:53 2019 +0700
[OPENMEETINGS-2093] reflow-skin, spring, tomcat, ical4j, h2, bcprov, mockito and kurento are updated
---
openmeetings-core/pom.xml | 1 -
.../src/main/jnlp/templates/template.jnlp | 2 +-
openmeetings-server/pom.xml | 2 +-
pom.xml | 20 +++++++++++++-------
4 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index c29bcea..344a8af 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -104,7 +104,6 @@
<dependency>
<groupId>org.kurento</groupId>
<artifactId>kurento-client</artifactId>
- <version>6.11.0</version>
</dependency>
<!-- Test dependencies -->
<dependency>
diff --git a/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp b/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
index 4c3043d..40b3090 100644
--- a/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
+++ b/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
@@ -33,7 +33,7 @@
</security>
<resources>
<j2se version='1.8+'/>
- <jar href="bcprov-jdk15on-1.63.jar" main="true"/>
+ <jar href="bcprov-jdk15on-1.64.jar" main="true"/>
<jar href="openmeetings-screenshare-${project.version}-full.jar" main="true"/>
</resources>
<application-desc main-class='org.apache.openmeetings.screenshare.Core'>
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index e85146a..96263da 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -117,7 +117,7 @@
<id>prepare-web-server</id>
<activation>
<file>
- <missing>web-server/apache-tomcat-9.0.26.tar.gz</missing> <!-- TODO should be in-sync with global property -->
+ <missing>web-server/apache-tomcat-9.0.27.tar.gz</missing> <!-- TODO should be in-sync with global property -->
</file>
</activation>
<build>
diff --git a/pom.xml b/pom.xml
index d9bebb3..36a24ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
<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.2</reflow-maven-skin.version>
+ <reflow-maven-skin.version>2.1.0</reflow-maven-skin.version>
<reflow-theme>cerulean</reflow-theme>
<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>
@@ -78,17 +78,17 @@
<wicketju.version>9.0.0-M3</wicketju.version>
<wickets.version>9.0.1-M3</wickets.version>
<red5-client.version>1.1.1</red5-client.version>
- <spring.version>5.1.9.RELEASE</spring.version>
+ <spring.version>5.2.0.RELEASE</spring.version>
<mina.version>2.1.3</mina.version>
- <tomcat.version>9.0.26</tomcat.version>
- <ical4j.version>3.0.9</ical4j.version>
+ <tomcat.version>9.0.27</tomcat.version>
+ <ical4j.version>3.0.11</ical4j.version>
<cxf.version>3.3.3</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>
<site.basedir>${project.basedir}</site.basedir>
<src.pack.skip>false</src.pack.skip>
- <h2.version>1.4.199</h2.version>
+ <h2.version>1.4.200</h2.version>
<commons-lang3.version>3.9</commons-lang3.version>
<javax.mail.version>1.6.2</javax.mail.version>
<openjpa.version>3.1.0</openjpa.version>
@@ -112,10 +112,11 @@
<logback.version>1.2.3</logback.version>
<jetty.version>9.4.20.v20190813</jetty.version>
<license.excludedScopes>test</license.excludedScopes>
- <bcprov-jdk15on.version>1.63</bcprov-jdk15on.version>
- <mockito.version>3.0.0</mockito.version>
+ <bcprov-jdk15on.version>1.64</bcprov-jdk15on.version>
+ <mockito.version>3.1.0</mockito.version>
<powermock.version>2.0.2</powermock.version>
<quartz.version>2.3.1</quartz.version>
+ <kurento.version>6.12.0</kurento.version>
<!-- Exclude all generated code -->
<sonar.exclusions>file:**/generated-sources/**, file:**/jquery-ui.css, file:**/fabric.js, file:**/cssemoticons.js, file:**/kurento-utils.js, file:**/fileinput*.js, file:**/MathJax.js, file:**/network.js, file:**/jquery.dialogextend.js</sonar.exclusions>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -689,6 +690,11 @@
<version>1.1</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.kurento</groupId>
+ <artifactId>kurento-client</artifactId>
+ <version>${kurento.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>