From db7bd49897e234a1c19f6805c111f263a7ea8cc5 Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Fri, 18 May 2018 14:33:37 +0200 Subject: [PATCH] MS SQL Server support in hawkBit runtime (#684) * Official MS SQL Server support. Signed-off-by: kaizimmerm * Fix typo. Signed-off-by: kaizimmerm --- 3rd-dependencies/Release_0_2_0.md | 1 + 3rd-dependencies/compile.txt | 1 + 3rd-dependencies/test.txt | 1 - README.md | 4 ++-- hawkbit-runtime/hawkbit-update-server/pom.xml | 4 ++++ 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/3rd-dependencies/Release_0_2_0.md b/3rd-dependencies/Release_0_2_0.md index 2f35db7b0..fefc42da5 100644 --- a/3rd-dependencies/Release_0_2_0.md +++ b/3rd-dependencies/Release_0_2_0.md @@ -4,6 +4,7 @@ | Group ID | Artifact ID | Version | CQ | |---|---|---|---| +|com.microsoft.sqlserver|mssql-jdbc|6.4.0| [CQ15896](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=15896) | |com.cronutils|cron-utils|5.0.5| [CQ15762](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=15762) | |com.github.ben-manes.caffeine|caffeine|2.3.5| [CQ13563](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13563) | |aopalliance|aopalliance|1.0| [CQ10346](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10346) | diff --git a/3rd-dependencies/compile.txt b/3rd-dependencies/compile.txt index 9fc8a6e06..14566243f 100644 --- a/3rd-dependencies/compile.txt +++ b/3rd-dependencies/compile.txt @@ -12,6 +12,7 @@ com.github.gwtd3:gwt-d3-js:jar:sources:3.5.11:compile com.google.guava:guava:jar:25.0-jre:compile com.h2database:h2:jar:1.4.195:compile + com.microsoft.sqlserver:mssql-jdbc:jar:6.4.0.jre8:compile com.rabbitmq:amqp-client:jar:4.0.3:compile com.rabbitmq:http-client:jar:1.3.1.RELEASE:compile com.vaadin.external.atmosphere:atmosphere-runtime:jar:2.2.9.vaadin2:compile diff --git a/3rd-dependencies/test.txt b/3rd-dependencies/test.txt index 91f5061be..f017d70cd 100644 --- a/3rd-dependencies/test.txt +++ b/3rd-dependencies/test.txt @@ -13,7 +13,6 @@ com.ibm.icu:icu4j:jar:50.1.1:test com.jayway.awaitility:awaitility:jar:1.7.0:test com.jayway.jsonpath:json-path:jar:2.0.0:test - com.microsoft.sqlserver:mssql-jdbc:jar:6.4.0.jre8:test commons-collections:commons-collections:jar:3.2.2:test javax.el:javax.el-api:jar:2.2.4:test junit:junit:jar:4.12:test diff --git a/README.md b/README.md index de568eff2..d8de696ea 100644 --- a/README.md +++ b/README.md @@ -53,9 +53,9 @@ There are clients outside of the Eclipse IoT eco system as well, e.g.: | DDLs maintained by project | X | X | X | X | | Test dependencies defined | X | X | X | - | | Versions tested | 1.4 | MySQL 5.6/5.7, AWS Aurora | MS SQL Server 2017 | DB2 Server v11.1 | -| Docker image with driver provided | X | X | - | - | +| Docker image with driver provided | X | X (Tag: "-mysql") | X | - | | JDBC driver | [H2 1.4](https://github.com/h2database/h2database) | [MariaDB Connector/J 2.0](https://github.com/MariaDB/mariadb-connector-j) | [MSSQL-JDBC 6.4](https://github.com/Microsoft/mssql-jdbc) | - | -| Status | Test, Dev, Trial | Production grade | Experimental | Test, Dev | +| Status | Test, Dev, Trial | Production grade | Production grade | Test, Dev | ## (Optional) RabbitMQ: 3.6,3.7 diff --git a/hawkbit-runtime/hawkbit-update-server/pom.xml b/hawkbit-runtime/hawkbit-update-server/pom.xml index df4eef86d..0662a3143 100644 --- a/hawkbit-runtime/hawkbit-update-server/pom.xml +++ b/hawkbit-runtime/hawkbit-update-server/pom.xml @@ -69,6 +69,10 @@ com.h2database h2 + + com.microsoft.sqlserver + mssql-jdbc +