-
Notifications
You must be signed in to change notification settings - Fork 433
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update 11.2 servicing branch to run on test pipelines + dependency update #2602
Open
Jeffery-Wasty
wants to merge
49
commits into
v11.2-servicing
Choose a base branch
from
11.2-test-jeff
base: v11.2-servicing
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 19abc22.
This reverts commit 04f8c82.
This reverts commit b727a96.
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]>
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]>
Signed-off-by: Jeff Wasty <[email protected]>
Fix tests for testing encrypt options (#2215)
Signed-off-by: Jeff Wasty <[email protected]> # Conflicts: # src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ErrorMessageTest.java # src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthCommon.java
This reverts commit dfb4b77.
This reverts commit da5c58b.
…et to app registration
…t incorporate for this release
There was a problem hiding this 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();
src/main/java/com/microsoft/sqlserver/jdbc/SQLServerSecurityUtility.java
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
ActiveDirectoryServicePrincipalCertificate
authentication - Add ActiveDirectoryServicePrincipalCertificate authentication #2128Test & Configuration Changes
Kerberos
excluded group - Adding a new connection property "useDefaultJaasConfig" to coexist with solutions that overwrite the system JAAS #2147bcprov
fromjdk15on
tojdk18on
- Update dependency versions #2182trustServerCertificate=true
for Always Encrypted tests - Set trustServerCertificate=true for AE tests #2202requireSecret
exclude tag for tests - Add "requireSecret" exclude tag for tests which require adding a secret to app registration #2596Additionally 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.