Skip to content

Conversation

@Jeffery-Wasty
Copy link
Contributor

@Jeffery-Wasty Jeffery-Wasty commented Feb 11, 2025

This updates the 11.2 servicing branch with the necessary code changes to run on the build, test, and release pipelines. In order to run successfully the following changes need to be merged into the branch:


Additions

Test & Configuration Changes

Additionally this updates the versions of the dependencies used in the 11.2 release to be the same as those in the the latest stable release (12.10.0) - #2584.

Jeffery-Wasty and others added 30 commits January 21, 2025 14:56
Signed-off-by: Jeff Wasty <[email protected]>
Signed-off-by: Jeff Wasty <[email protected]>

# Conflicts:
#	src/test/java/com/microsoft/sqlserver/jdbc/SQLServerConnectionTest.java
#	src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java
#	src/test/java/com/microsoft/sqlserver/jdbc/TestUtils.java
#	src/test/java/com/microsoft/sqlserver/jdbc/connection/TimeoutTest.java
#	src/test/java/com/microsoft/sqlserver/jdbc/databasemetadata/DatabaseMetaDataTest.java
#	src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/BatchExecutionTest.java
This reverts commit 6d5c519.
Signed-off-by: Jeff Wasty <[email protected]>

# Conflicts:
#	src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MSITest.java
Signed-off-by: Jeff Wasty <[email protected]>
Signed-off-by: Jeff Wasty <[email protected]>
Signed-off-by: Jeff Wasty <[email protected]>
Signed-off-by: Jeff Wasty <[email protected]>
Signed-off-by: Jeff Wasty <[email protected]>
@Jeffery-Wasty Jeffery-Wasty self-assigned this Feb 11, 2025
@codecov
Copy link

codecov bot commented Feb 11, 2025

Codecov Report

Attention: Patch coverage is 20.28640% with 334 lines in your changes missing coverage. Please review.

Please upload report for BASE (v11.2-servicing@c915fa0). Learn more about missing BASE report.

Files with missing lines Patch % Lines
.../microsoft/sqlserver/jdbc/SQLServerConnection.java 19.35% 96 Missing and 29 partials ⚠️
...microsoft/sqlserver/jdbc/SQLServerMSAL4JUtils.java 0.00% 121 Missing ⚠️
...osoft/sqlserver/jdbc/SQLServerSecurityUtility.java 33.33% 29 Missing and 3 partials ⚠️
.../com/microsoft/sqlserver/jdbc/SQLServerDriver.java 54.54% 25 Missing and 5 partials ⚠️
...in/java/com/microsoft/sqlserver/jdbc/IOBuffer.java 0.00% 11 Missing and 1 partial ⚠️
...soft/sqlserver/jdbc/SQLServerCertificateUtils.java 11.11% 8 Missing ⚠️
...t/sqlserver/jdbc/SQLServerConnectionPoolProxy.java 0.00% 2 Missing ⚠️
.../microsoft/sqlserver/jdbc/SQLServerDataSource.java 33.33% 2 Missing ⚠️
...soft/sqlserver/jdbc/SQLServerDatabaseMetaData.java 0.00% 1 Missing ⚠️
.../com/microsoft/sqlserver/jdbc/SqlFedAuthToken.java 50.00% 1 Missing ⚠️
Additional details and impacted files
@@                Coverage Diff                 @@
##             v11.2-servicing    #2602   +/-   ##
==================================================
  Coverage                   ?   50.37%           
  Complexity                 ?     3698           
==================================================
  Files                      ?      144           
  Lines                      ?    32178           
  Branches                   ?     5392           
==================================================
  Hits                       ?    16210           
  Misses                     ?    13650           
  Partials                   ?     2318           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@Jeffery-Wasty Jeffery-Wasty added this to the 11.2.4 milestone Feb 13, 2025
@Jeffery-Wasty Jeffery-Wasty marked this pull request as ready for review February 19, 2025 17:11
@Jeffery-Wasty Jeffery-Wasty removed Work in Progress The pull request is a work in progress labels Feb 19, 2025
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot reviewed 49 out of 64 changed files in this pull request and generated 3 comments.

Files not reviewed (15)
  • mssql-jdbc_auth_LICENSE: Language not supported
  • pom.xml: Language not supported
  • src/samples/adaptive/pom.xml: Language not supported
  • src/main/java/com/microsoft/sqlserver/jdbc/SQLServerColumnEncryptionAzureKeyVaultProvider.java: Evaluated as low risk
  • src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java: Evaluated as low risk
  • src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDatabaseMetaData.java: Evaluated as low risk
  • src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResource.java: Evaluated as low risk
  • src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCertificateUtils.java: Evaluated as low risk
  • src/main/java/com/microsoft/sqlserver/jdbc/SqlFedAuthToken.java: Evaluated as low risk
  • README.md: Evaluated as low risk
  • src/main/java/com/microsoft/sqlserver/jdbc/ISQLServerDataSource.java: Evaluated as low risk
  • src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataSource.java: Evaluated as low risk
  • CHANGELOG.md: Evaluated as low risk
  • src/main/java/com/microsoft/sqlserver/jdbc/ISQLServerConnection.java: Evaluated as low risk
  • src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnectionPoolProxy.java: Evaluated as low risk
Comments suppressed due to low confidence (2)

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDriver.java:67

  • [nitpick] Enum values should follow a consistent naming convention. Consider using camelCase for enum values.
NOT_SPECIFIED("NotSpecified"),

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerSecurityUtility.java:399

  • The DefaultAzureCredentialBuilder is built twice, which is unnecessary. Ensure that it is built only once.
dac = dacBuilder.build();

lilgreenbird
lilgreenbird previously approved these changes Feb 24, 2025
@Jeffery-Wasty Jeffery-Wasty merged commit 921abb7 into v11.2-servicing Mar 19, 2025
17 checks passed
@github-project-automation github-project-automation bot moved this from Under Peer Review to Closed/Merged PRs in MSSQL JDBC Mar 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Closed/Merged PRs

Development

Successfully merging this pull request may close these issues.

4 participants