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 4f564a9 [OPENMEETINGS-1859] mssql jdbc driver is updated and bundled
4f564a9 is described below
commit 4f564a976e85f2805618c83dbec9c261387bf199
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Wed Mar 20 12:03:27 2019 +0700
[OPENMEETINGS-1859] mssql jdbc driver is updated and bundled
---
LICENSE | 1 +
openmeetings-db/pom.xml | 5 +++++
openmeetings-server/src/site/xdoc/MSSQLConfig.xml | 19 ++-----------------
openmeetings-web/pom.xml | 7 -------
pom.xml | 2 +-
5 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/LICENSE b/LICENSE
index 4e07dd5..5c14eaa 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2507,6 +2507,7 @@ webapps/openmeetings/WEB-INF/lib/grib-*.jar
webapps/openmeetings/WEB-INF/lib/checker-compat-qual-*.jar
webapps/openmeetings/WEB-INF/lib/jdk-serializable-functional-1.8.3.jar
webapps/openmeetings/WEB-INF/lib/animal-sniffer-annotations-*.jar
+webapps/openmeetings/WEB-INF/lib/mssql-jdbc-*.jar
The MIT License (MIT)
diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml
index 0d78fdc..4834159 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.mina</groupId>
<artifactId>mina-core</artifactId>
<version>${mina.version}</version>
diff --git a/openmeetings-server/src/site/xdoc/MSSQLConfig.xml
b/openmeetings-server/src/site/xdoc/MSSQLConfig.xml
index b8365c6..dedf888 100644
--- a/openmeetings-server/src/site/xdoc/MSSQLConfig.xml
+++ b/openmeetings-server/src/site/xdoc/MSSQLConfig.xml
@@ -13,16 +13,14 @@
limitations under the License.
-->
<document xmlns="http://maven.apache.org/XDOC/2.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/XDOC/2.0
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
<properties>
<title>MSSQL Configuration</title>
<author email="d...@openmeetings.apache.org">Apache
OpenMeetings Team</author>
</properties>
-
<body>
<section name="MSSQL Configuration">
-
<subsection name="Before you start">
<ul>
<li>You need Openmeetings 2.2 or later
to use MSSQL integration</li>
@@ -42,23 +40,14 @@
</li>
</ul>
</subsection>
-
<subsection name="Steps todo">
<ul>
<li>
- You need to download the JDBC
driver from Microsoft
- <a
href="http://www.microsoft.com/en-us/download/details.aspx?displaylang=en&id=11774";
target="_blank"
-
rel="nofollow">http://www.microsoft.com/en-us/download/details.aspx?displaylang=en&id=11774</a>
- Unarchive appropriate file from
it (sqljdbc.jar or sqljdbc4.jar) and place it into:
-
<tt>$OM_HOME/webapps/openmeetings/WEB-INF/lib/</tt>
- </li>
- <li>
Run OpenMeetings and goto the
web-based installer:
http://localhost:5080/openmeetings/install
</li>
</ul>
</subsection>
-
<subsection name="MSSQL Sample Configuration">
<p>
There is a sample configuration for
MySQL that ships with
@@ -67,10 +56,6 @@
/webapps/openmeetings/WEB-INF/classes/META-INF/mssql_persistence.xml
</p>
</subsection>
-
-
</section>
-
</body>
-
</document>
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 93a38c8..8afe126 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 61222ac..42fe67f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,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>
<commons-collections4.version>4.3</commons-collections4.version>
<xstream.version>1.4.11.1</xstream.version>
<api-all.version>2.0.0.AM2</api-all.version>
