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/03/22 06:43:11 UTC
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-2037] libraies
are updated
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 614f299 [OPENMEETINGS-2037] libraies are updated
614f299 is described below
commit 614f299573c6c566d5b2c5571e70845c292e035d
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Mar 22 13:42:58 2019 +0700
[OPENMEETINGS-2037] libraies are updated
---
LICENSE | 1 +
openmeetings-db/pom.xml | 5 +++++
openmeetings-web/pom.xml | 7 -------
pom.xml | 8 ++++----
4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/LICENSE b/LICENSE
index a1f8697..9d3e3d2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2569,6 +2569,7 @@ lib/grib-*.jar
lib/checker-compat-qual-*.jar
lib/jdk-serializable-functional-1.8.3.jar
lib/animal-sniffer-annotations-*.jar
+lib/mssql-jdbc-*.jar
The MIT License (MIT)
diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml
index 3f319da..4979a2c 100644
--- a/openmeetings-db/pom.xml
+++ b/openmeetings-db/pom.xml
@@ -112,6 +112,11 @@
<version>${postgresql.version}</version>
</dependency>
<dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>mssql-jdbc</artifactId>
+ <version>${mssql.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-util</artifactId>
<version>${project.version}</version>
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 311090b..316fd4e 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -56,13 +56,6 @@
<db_user>sa</db_user>
<db_pass>ass</db_pass>
</properties>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>mssql-jdbc</artifactId>
- <version>${mssql.version}</version>
- </dependency>
- </dependencies>
</profile>
<profile>
<id>Jenkins</id>
diff --git a/pom.xml b/pom.xml
index ee522ce..16d4aea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,10 +79,10 @@
<red5-server.version>1.0.10</red5-server.version>
<red5-client.version>1.0.10</red5-client.version>
<spring.version>5.1.5.RELEASE</spring.version>
- <mina.version>2.0.20</mina.version>
+ <mina.version>2.1.0</mina.version>
<tomcat.version>9.0.17</tomcat.version>
<ical4j.version>3.0.6</ical4j.version>
- <cxf.version>3.3.0</cxf.version>
+ <cxf.version>3.3.1</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>
@@ -102,7 +102,7 @@
<commons-codec.version>1.12</commons-codec.version>
<commons-io.version>2.6</commons-io.version>
<mysql.version>8.0.11</mysql.version>
- <mssql.version>6.2.1.jre8</mssql.version>
+ <mssql.version>7.2.1.jre8</mssql.version>
<pdfbox.version>2.0.14</pdfbox.version>
<commons-collections4.version>4.3</commons-collections4.version>
<xstream.version>1.4.11.1</xstream.version>
@@ -112,7 +112,7 @@
<commons-text.version>1.6</commons-text.version>
<license.excludedScopes>test</license.excludedScopes>
<bcprov-jdk15on.version>1.61</bcprov-jdk15on.version>
- <mockito.version>2.24.5</mockito.version>
+ <mockito.version>2.25.1</mockito.version>
<jaxws-api.version>2.3.1</jaxws-api.version>
<javax.jws-api.version>1.1</javax.jws-api.version>
<!-- URL of the ASF SonarQube server -->