diff --git a/CHANGELOG.md b/CHANGELOG.md
index 700f4a6e4c..ba5de404f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,26 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
+## [7.0.0] Stable Release
+### Added
+- Added 'Automatic-Module-Name' manifest entry to jre10 Jar, allowing JDK 10 users to access driver module 'com.microsoft.sqlserver.jdbc' [#732](https://github.com/Microsoft/mssql-jdbc/pull/732)
+- Added setUseBulkCopyForBatchInsert() to request boundary declaration APIs [#739](https://github.com/Microsoft/mssql-jdbc/pull/739)
+- Added new test for validation of supported public APIs in request boundary declaration APIs [#746](https://github.com/Microsoft/mssql-jdbc/pull/746)
+
+### Fixed Issues
+- Fixed policheck issue with 'Country' keyword [#745](https://github.com/Microsoft/mssql-jdbc/pull/745)
+- Fixed issues reported by static analysis tools (SonarQube, Fortify) [#747](https://github.com/Microsoft/mssql-jdbc/pull/747)
+
+### Changed
+- Reformatted code and updated mssql-jdbc-formatter [#742](https://github.com/Microsoft/mssql-jdbc/pull/742)
+- Changed Sha1HashKey to CityHash128Key for generating PreparedStatement handle and metadata cache keys [#717](https://github.com/Microsoft/mssql-jdbc/pull/717)
+- Changed order of logic for checking the condition for using Bulk Copy API [#736](https://github.com/Microsoft/mssql-jdbc/pull/736)
+- Changed collation name in UTF8SupportTest [#741](https://github.com/Microsoft/mssql-jdbc/pull/741)
+- Changed scope of unwanted Public APIs [#757](https://github.com/Microsoft/mssql-jdbc/pull/757)
+- Changed behavior of Bulk Copy API for batch inserts to disallow non-parameterized queries [#756](https://github.com/Microsoft/mssql-jdbc/pull/756)
+- Changed APIs and JavaDocs for Spatial Datatypes [#752](https://github.com/Microsoft/mssql-jdbc/pull/752)
+- Improved Javadoc comments in driver [#754](https://github.com/Microsoft/mssql-jdbc/pull/754), [#760](https://github.com/Microsoft/mssql-jdbc/pull/760)
+
## [6.5.4] Preview Release
### Added
- Added new connection property "useBulkCopyForBatchInsert" to enable Bulk Copy API support for batch insert operation [#686](https://github.com/Microsoft/mssql-jdbc/pull/686)
diff --git a/README.md b/README.md
index ece0f92773..e0645c2599 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,7 @@ We're now on the Maven Central Repository. Add the following to your POM file to
com.microsoft.sqlserver
mssql-jdbc
- 6.4.0.jre9
+ 7.0.0.jre10
```
The driver can be downloaded from the [Microsoft Download Center](https://go.microsoft.com/fwlink/?linkid=868287).
@@ -91,7 +91,8 @@ To get the latest preview version of the driver, add the following to your POM f
6.5.4.jre10-preview
```
-
+### Using driver as Java Module
+Starting from version 7.0.0, the driver Jars (jre10 and above) will expose 'Automatic-Module' as **'com.microsoft.sqlserver.jdbc'**. The supporting Jar can now be added to ModulePath to access this module.
## Dependencies
@@ -118,7 +119,7 @@ Projects that require either of the two features need to explicitly declare the
com.microsoft.sqlserver
mssql-jdbc
- 6.5.4.jre10-preview
+ 7.0.0.jre10
compile
@@ -134,7 +135,7 @@ Projects that require either of the two features need to explicitly declare the
com.microsoft.sqlserver
mssql-jdbc
- 6.5.4.jre10-preview
+ 7.0.0.jre10
compile
diff --git a/build.gradle b/build.gradle
index f37e5793fb..876f451c16 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@
apply plugin: 'java'
-version = '7.0.0-SNAPSHOT'
+version = '7.0.0'
def jreVersion = ""
def testOutputDir = file("build/classes/java/test")
def archivesBaseName = 'mssql-jdbc'
@@ -29,7 +29,11 @@ if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile
jreVersion = "jre10"
excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java'
-
+ jar {
+ manifest {
+ attributes 'Automatic-Module-Name': 'com.microsoft.sqlserver.jdbc'
+ }
+ }
sourceCompatibility = 10
targetCompatibility = 10
}
diff --git a/pom.xml b/pom.xml
index f7e59b162b..8a03920cfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.microsoft.sqlserver
mssql-jdbc
- 7.0.0-SNAPSHOT
+ 7.0.0
jar
Microsoft JDBC Driver for SQL Server
@@ -65,7 +65,6 @@
4.12
test
-
org.junit.platform
junit-platform-console
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java
index 5d5b097159..824dfdf8f9 100644
--- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java
+++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java
@@ -6,8 +6,8 @@
package com.microsoft.sqlserver.jdbc;
final class SQLJdbcVersion {
- static final int major = 6;
- static final int minor = 5;
- static final int patch = 4;
+ static final int major = 7;
+ static final int minor = 0;
+ static final int patch = 0;
static final int build = 0;
}