Merging release/6.3.0 into master #1602
Merged
Conversation
This file contains hidden or 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
Adding CODEOWNERS
Mostly just testing to ensure that the warning goes away in Snyk.
Fixing warning in cookbook reported by Snyk
Latest OkHttp 4.x is still on 3.2.0, which is affected by https://security.snyk.io/vuln/SNYK-JAVA-COMSQUAREUPOKIO-5820002 . Bumped up patch version of a few other dependencies as well; those only impact test and build dependencies and do not impact anything that's published.
Forcing usage of okio 3.4.0
Updated test based on DBQ-126 fix
Added comment about ML-Check-ML11-Headers
Made a couple of small improvements to how errors are reported for a couple of the scenarios in this test too. Removed ignored/obsolete test for certificate auth that I could never get to work.
This is for customers that do not want responses to be gzip-encoded.
Added example of removing the Accept-Encoding header
Added test for two-way SSL.
Addresses CVE https://nvd.nist.gov/vuln/detail/CVE-2023-34624 . Pushing to master to remove this from vulnerability report.
Avoids me thinking that e.g. "rest-evaluator" is an actual MarkLogic OOTB role. Tossed "java-test-" on as a prefix for several existing test-only roles.
Renamed test roles to make it clear they're for the Java Client
DEVEXP-155 Added disabled test for setMaxBatches
Users no longer need to parse out exception messages. And now `TestOptimisticLocking` doesn't need to either, which allowed me to delete a bunch of code from it in favor of asserting on specific exception classes. This is a non-breaking change as the new exceptions are subclasses of `FailedRequestException` and contain the same error message.
Just unit tests for this until we have a Cloud instance for automated tests.
DEVEXP-469 Optimistic locking failures now throw concrete exceptions
DEVEXP-491 Can now configure token duration
This logic is from ml-javaclient-util, pretty much copy/pasted it and added tests. Also moved a test to the new "client.test.io" package as I don't like how we have a zillion tests in the "com.marklogic.client.test" package.
DEVEXP-478 New addFromString method for permissions
DatabaseClientFactory also supports multiple configurators now. This was essential for testing this new story, but it also aligns with what a user would expect a method named "add" to do (as opposed to "set"). `clearConfigurators` was also added both for testing purposes and so a user could remove all the configurators in case one or more should no longer be used.
DEVEXP-562 Can now prevent Accept-Encoding=gzip header being used
This should be a no-op in terms of functionality; just bumping to get the latest security fixes in Jackson.
Bumping Jackson dependencies to latest
This fixes the ml-development-tools tests that started failing when Jackson was bumped from 2.14.3 to 2.15.2. 50 tests failed with a message like this: org.gradle.api.GradleException: Failed to create Jar file /space/Jenkins/workspace/va-client-api-regression_develop/java-client-api/ml-development-tools/build/tmp/test/work/.gradle-test-kit/caches/jars-9/ba996557e7d64c47da7a273bf722472f/jackson-core-2.15.2.jar. I'm going to separately look into bumping the Kotlin dependencies of that project as the current ones are quite old.
Bumping Gradle wrapper version
Got rid of the custom code for setting up / tearing down databases and app servers. Changed the test code to use port 8013, as java-client-api is already using 8012 and 8014. Updated gitignore as well so you can run the tests and not have 1400+ changes sitting in your branch. The 3 Java files that were updated are all test files and were updated when I ran `generateTests`.
ml-development-tools now uses test-app
Did not bump kotlin-stdlib though - 1.6.20 is what OkHttp 4.11.0 uses, so sticking with that for now.
Bumped dependencies on dev-tools
This could probably be expanded later, but I wanted to have something available for some basic manual/smoke testing.
These are the same ones used on some other projects and we'll soon get them in place on all of them.
Added example project for testing ml-development-tools
Adding badges to README
This seems required by the version of Gradle, at least according to the failing Jenkins build. The ml-development-tools plugin still builds and tests correctly.
BillFarber
approved these changes
Sep 7, 2023
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.
No description provided.