Skip to content

Commit fa59193

Browse files
TaojunshenTaojunshen
authored
Merge pull request #2574 from MicrosoftDocs/master
7/20 AM Publish
2 parents cf8509c + 5e7d695 commit fa59193

27 files changed

+600
-284
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ _themes/
66
_themes.MSDN.Modern/
77
_themes.VS.Modern/
88

9-
.openpublishing.buildcore.ps1
9+
.openpublishing.buildcore.ps1

‎.openpublishing.publish.config.json‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,73 @@
11
{
2-
"build_entry_point": "docs",
3-
"need_generate_pdf": false,
4-
"need_generate_pdf_url_template": true,
5-
"need_generate_intellisense": false,
6-
"branch_target_mapping": {
7-
"live": [
8-
"Publish", "PDF"
9-
],
10-
"master": [
11-
"Publish", "PDF"
12-
]
13-
},
14-
"Targets": {
15-
"Pdf": {
16-
"template_folder": "_themes.pdf"
17-
}
18-
},
19-
"docsets_to_publish": [{
20-
"docset_name": "analytics-platform-system",
21-
"build_source_folder": "docs-msdn/analytics-platform-system",
22-
"build_output_subfolder": "sql/analytics-platform-system",
23-
"locale": "en-us",
24-
"version": 0,
25-
"open_to_public_contributors": true,
26-
"type_mapping": {
27-
"Conceptual": "Content",
28-
"ManagedReference": "Content",
29-
"RestApi": "Content"
30-
},
31-
"build_entry_point": "op"
32-
},
33-
{
34-
"docset_name": "sql-content",
35-
"build_source_folder": "docs",
36-
"build_output_subfolder": "sql",
37-
"locale": "en-us",
38-
"version": 0,
39-
"open_to_public_contributors": true,
40-
"type_mapping": {
41-
"Conceptual": "Content",
42-
"ManagedReference": "Content",
43-
"RestApi": "Content"
44-
},
45-
"build_entry_point": "docs",
46-
"template_folder": "_themes"
47-
}
48-
],
49-
"notification_subscribers": [],
50-
"branches_to_filter": [],
51-
"skip_source_output_uploading": false,
52-
"need_preview_pull_request": true,
53-
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/sql-docs",
2+
"build_entry_point": "docs",
3+
"need_generate_pdf": false,
4+
"need_generate_pdf_url_template": true,
5+
"need_generate_intellisense": false,
6+
"branch_target_mapping": {
7+
"live": [
8+
"Publish", "PDF"
9+
],
10+
"master": [
11+
"Publish", "PDF"
12+
]
13+
},
14+
"Targets": {
15+
"Pdf": {
16+
"template_folder": "_themes.pdf"
17+
}
18+
},
19+
"docsets_to_publish": [{
20+
"docset_name": "analytics-platform-system",
21+
"build_source_folder": "docs-msdn/analytics-platform-system",
22+
"build_output_subfolder": "sql/analytics-platform-system",
23+
"locale": "en-us",
24+
"version": 0,
25+
"open_to_public_contributors": true,
26+
"type_mapping": {
27+
"Conceptual": "Content",
28+
"ManagedReference": "Content",
29+
"RestApi": "Content"
30+
},
31+
"build_entry_point": "op"
32+
},
33+
{
34+
"docset_name": "sql-content",
35+
"build_source_folder": "docs",
36+
"build_output_subfolder": "sql",
37+
"locale": "en-us",
38+
"version": 0,
39+
"open_to_public_contributors": true,
40+
"type_mapping": {
41+
"Conceptual": "Content",
42+
"ManagedReference": "Content",
43+
"RestApi": "Content"
44+
},
45+
"build_entry_point": "docs",
46+
"template_folder": "_themes"
47+
}
48+
],
49+
"notification_subscribers": [],
50+
"branches_to_filter": [],
51+
"skip_source_output_uploading": false,
52+
"need_preview_pull_request": true,
53+
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/sql-docs",
5454
"git_repository_branch_open_to_public_contributors": "live",
55-
"dependent_repositories": [{
56-
"path_to_root": "_themes",
57-
"url": "https://github.com/Microsoft/templates.docs.msft",
58-
"branch": "master",
59-
"branch_mapping": {}
60-
},
61-
{
62-
"path_to_root": "_themes.MSDN.Modern",
63-
"url": "https://github.com/Microsoft/templates.msdn.msft",
64-
"branch": "master",
65-
"branch_mapping": {}
66-
},
67-
{
68-
"path_to_root": "_themes.pdf",
69-
"url": "https://github.com/Microsoft/templates.docs.msft.pdf",
70-
"branch": "master"
71-
}
72-
]
73-
}
55+
"dependent_repositories": [{
56+
"path_to_root": "_themes",
57+
"url": "https://github.com/Microsoft/templates.docs.msft",
58+
"branch": "master",
59+
"branch_mapping": {}
60+
},
61+
{
62+
"path_to_root": "_themes.MSDN.Modern",
63+
"url": "https://github.com/Microsoft/templates.msdn.msft",
64+
"branch": "master",
65+
"branch_mapping": {}
66+
},
67+
{
68+
"path_to_root": "_themes.pdf",
69+
"url": "https://github.com/Microsoft/templates.docs.msft.pdf",
70+
"branch": "master"
71+
}
72+
]
73+
}

‎ThirdPartyNotices‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
##Legal Notices
2+
Microsoft and any contributors grant you a license to the Microsoft documentation and other content
3+
in this repository under the [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/legalcode),
4+
see the [LICENSE](LICENSE) file, and grant you a license to any code in the repository under the [MIT License](https://opensource.org/licenses/MIT), see the
5+
[LICENSE-CODE](LICENSE-CODE) file.
6+
7+
Microsoft, Windows, Microsoft Azure and/or other Microsoft products and services referenced in the documentation
8+
may be either trademarks or registered trademarks of Microsoft in the United States and/or other countries.
9+
The licenses for this project do not grant you rights to use any Microsoft names, logos, or trademarks.
10+
Microsoft's general trademark guidelines can be found at http://go.microsoft.com/fwlink/?LinkID=254653.
11+
12+
Privacy information can be found at https://privacy.microsoft.com/en-us/
13+
14+
Microsoft and any contributors reserve all others rights, whether under their respective copyrights, patents,
15+
or trademarks, whether by implication, estoppel or otherwise.

‎contributor-guide/tools-and-setup.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
# Install and set up tools for authoring in GitHub
1+
# Install and set up tools for authoring in Git
22

33
> [!NOTE]
44
> See the contributors guide in the [azure-docs repo](https://github.com/MicrosoftDocs/azure-docs/tree/master/contributor-guide).
55
The guide contains informaton on permissions, installation of tools, and the basics for making edits and pull erquests.
6+
7+
- [Git basics] (https://git-scm.com/book/en/v2/Getting-Started-Git-Basics).
8+
- [Visual Studio Code - VS Code,](https://www.visualstudio.com/products/code-vs.aspx) A good markdown editor with git integration. It's updated often and keeps getting better.

‎docs/connect/jdbc/download-microsoft-jdbc-driver-for-sql-server.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ The JDBC Driver can be added to a Maven project by adding it as a dependency in
2525
<dependency>
2626
<groupId>com.microsoft.sqlserver</groupId>
2727
<artifactId>mssql-jdbc</artifactId>
28-
<version>6.2.0.jre8</version>
28+
<version>6.2.1.jre8</version>
2929
</dependency>
3030
```
3131
## Download previous versions of JDBC Drivers for SQL Server

‎docs/connect/jdbc/frequently-asked-questions-faq-for-jdbc-driver.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ The JDBC Driver is open source and the source code can be found on [GitHub](http
3232

3333
|JAR|JDBC Specification|JDK Version|
3434
|-|-|-|
35-
|mssql-jdbc-6.2.0.jre8.jar|JDBC 4.2, 4.1, and 4.0|JDK 8.0|
36-
|mssql-jdbc-6.2.0.jre7.jar|JDBC 4.1 and 4.0|JDK 7.0|
35+
|mssql-jdbc-6.2.1.jre8.jar|JDBC 4.2, 4.1, and 4.0|JDK 8.0|
36+
|mssql-jdbc-6.2.1.jre7.jar|JDBC 4.1 and 4.0|JDK 7.0|
3737

3838
The Microsoft JDBC Drivers 6.0 and 4.2 for SQL Server supports JDBC 4.0, 4.1, and 4.2 specifications and include two JAR class libraries in the installation package as follows:
3939

‎docs/connect/jdbc/microsoft-jdbc-driver-for-sql-server-support-matrix.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ manager: "jhubbard"
2929

3030
|Driver Name|Driver Package Version|Applicable JAR(s)|End of Mainstream Support|
3131
|-|-|-|-|
32-
|Microsoft JDBC Driver 6.2 for SQL Server|6.2|mssql-jdbc-6.2.0.jre8.jar<br> mssql-jdbc-6.2.0.jre7.jar|June 30, 2022|
32+
|Microsoft JDBC Driver 6.2 for SQL Server|6.2|mssql-jdbc-6.2.1.jre8.jar<br> mssql-jdbc-6.2.1.jre7.jar|June 30, 2022|
3333
|Microsoft JDBC Driver 6.0 for SQL Server|6.0|sqljdbc42.jar<br>sqljdbc41.jar|July 14, 2021|
3434
|Microsoft JDBC Driver 4.2 for SQL Server|4.2|sqljdbc42.jar<br>sqljdbc41.jar|August 24, 2020|
3535
|Microsoft JDBC Driver 4.1 for SQL Server|4.1|sqljdbc41.jar|December 12, 2019|

‎docs/connect/jdbc/release-notes-for-the-jdbc-driver.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@ manager: "jhubbard"
1919
[!INCLUDE[Driver_JDBC_Download](../../includes/driver_jdbc_download.md)]
2020

2121
## Updates in Microsoft JDBC Driver 6.2 for SQL Server
22-
The Microsoft JDBC Driver 6.2 for SQL Server is fully compliant with JDBC specifications 4.1 and 4.2. The jars contained in the 6.0 package are named according to Java version compatibility. For example, the mssql-jdbc-6.2.0.jre8.jar file from the 6.2 package is recommended to be used with Java 8.
22+
The Microsoft JDBC Driver 6.2 for SQL Server is fully compliant with JDBC specifications 4.1 and 4.2. The jars contained in the 6.0 package are named according to Java version compatibility. For example, the mssql-jdbc-6.2.1.jre8.jar file from the 6.2 package is recommended to be used with Java 8.
2323

24-
**Performance improvements for Prepared Statements**
25-
26-
Improved performance for Prepared Statements through caching (including prepared statement handle re-use). This behavior can be tuned using new properties to fit your application’s needs.
24+
**Note:** An issue with the metadata caching improvement was found in the JDBC 6.2 RTW released on June 29, 2017. The improvement was rolled back and new jars (version 6.2.1) were released on July 17, 2017 on the [Microsoft Download Center](https://go.microsoft.com/fwlink/?linkid=852460), [GitHub](https://github.com/Microsoft/mssql-jdbc/releases/tag/v6.2.1), and [Maven Central](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.microsoft.sqlserver%22%20AND%20a%3A%22mssql-jdbc%22). Please update your projects to use the 6.2.1 release jars. Please view [release notes](https://github.com/Microsoft/mssql-jdbc/releases/tag/v6.2.1) for more details.
2725

2826
**Azure Active Directory (AAD) support for Linux**
2927

‎docs/connect/jdbc/system-requirements-for-the-jdbc-driver.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,24 +42,24 @@ manager: "jhubbard"
4242

4343
**Microsoft JDBC Driver 6.2 for SQL Server:**
4444

45-
The JDBC Driver 6.2 includes two JAR class libraries in each installation package: **mssql-jdbc-6.2.0.jre7.jar**, and **mssql-jdbc-6.2.0.jre8.jar**.
45+
The JDBC Driver 6.2 includes two JAR class libraries in each installation package: **mssql-jdbc-6.2.1.jre7.jar**, and **mssql-jdbc-6.2.1.jre8.jar**.
4646

4747
The JDBC Driver 6.2 is designed to work with and be supported by all major Sun equivalent Java virtual machines, but is tested only on Sun JRE 5.0, 6.0, 7.0, and 8.0.
4848

4949
The following summarizes support provided by the two JAR files included with Microsoft JDBC Drivers 6.0 and 4.2 for SQL Server:
5050

5151
|JAR|JDBC Version Compliance|Recommended Java Version|Description|
5252
|---------|-----------------------------|----------------------|-----------------|
53-
|mssql-jdbc-6.2.0.jre7.jar|4.1|7|Requires a Java Runtime Environment (JRE) 7.0. Using JRE 6.0 or lower will throw an exception.<br /><br /> New Features in 6.2 include: Azure AD authentication for Linux, Principal/Password method for Kerberos, automatic detection of REALM in SPN for Cross-Domain authentication, Kerberos Constrained Delegation, Query Timeout, Socket Timeout, and prepared statement handle re-use. |
54-
|mssql-jdbc-6.2.0.jre8.jar|4.2|8|Requires a Java Runtime Environment (JRE) 8.0. Using JRE 7.0 or lower will throw an exception.<br /><br /> New Features in 6.2 include: Azure AD authentication for Linux, Principal/Password method for Kerberos, automatic detection of REALM in SPN for Cross-Domain authentication, Kerberos Constrained Delegation, Query Timeout, Socket Timeout, and prepared statement handle re-use|
53+
|mssql-jdbc-6.2.1.jre7.jar|4.1|7|Requires a Java Runtime Environment (JRE) 7.0. Using JRE 6.0 or lower will throw an exception.<br /><br /> New Features in 6.2 include: Azure AD authentication for Linux, Principal/Password method for Kerberos, automatic detection of REALM in SPN for Cross-Domain authentication, Kerberos Constrained Delegation, Query Timeout, Socket Timeout, and prepared statement handle re-use. |
54+
|mssql-jdbc-6.2.1.jre8.jar|4.2|8|Requires a Java Runtime Environment (JRE) 8.0. Using JRE 7.0 or lower will throw an exception.<br /><br /> New Features in 6.2 include: Azure AD authentication for Linux, Principal/Password method for Kerberos, automatic detection of REALM in SPN for Cross-Domain authentication, Kerberos Constrained Delegation, Query Timeout, Socket Timeout, and prepared statement handle re-use|
5555

5656
The JDBC Driver 6.2 is also available on the Maven Central Repository and can added to a Maven project by adding the following code in the POM.XML
5757

5858
```xml
5959
<dependency>
6060
<groupId>com.microsoft.sqlserver</groupId>
6161
<artifactId>mssql-jdbc</artifactId>
62-
<version>6.2.0.jre8</version>
62+
<version>6.2.1.jre8</version>
6363
</dependency>
6464
```
6565

‎docs/connect/jdbc/understanding-java-ee-support.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ manager: "jhubbard"
2323
First, make sure that your Java environment (JDK, JRE) includes the javax.sql package. This is a required package for any JDBC application that uses the optional API. JDK 1.5 and later versions already contain this package, so you do not have to install it separately.
2424

2525
## Driver Name
26-
The driver class name is **com.microsoft.sqlserver.jdbc.SQLServerDriver**. For JDBC Drivers 4.0, 4.1, 4.2, and 6.0, the driver is contained in the sqljdbc.jar, sqljdbc4.jar, sqljdbc41.jar, or sqljdbc42.jar file. For JDBC Driver 6.2, the driver is contained in mssql-jdbc-6.2.0.jre7-jar or mssql-jdbc-6.2.0-jre8.jar.
26+
The driver class name is **com.microsoft.sqlserver.jdbc.SQLServerDriver**. For JDBC Drivers 4.0, 4.1, 4.2, and 6.0, the driver is contained in the sqljdbc.jar, sqljdbc4.jar, sqljdbc41.jar, or sqljdbc42.jar file. For JDBC Driver 6.2, the driver is contained in mssql-jdbc-6.2.1.jre7.jar or mssql-jdbc-6.2.1.jre8.jar.
2727

2828
The class name is used whenever you load the driver with the JDBC DriverManager class. It is also used whenever you must specify the class name of the driver in any driver configuration. For example, configuring a data source within a Java EE application server might require that you enter the driver class name.
2929

0 commit comments

Comments
 (0)