21.x pull in 21.3 commits #3538
Merged
+3,341
−553
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
…date-catch_operation_to_schema_mismatch
Use the non deprecated method in the example.
Add max depth option to ExecutableNormalizedOperationFactory
Handle repeated query directives
Update readme
…ctive ends up affecting
…now in resolver - untested
…now in valueresolver - with tests from spec
…now in valueresolver - PR tweaks
…end to end test
Signed-off-by: Arthur Chan <arthur.chan@adalogics.com>
Fix OSGi bundle manifest
Previously, the graphql-java build would always produce a new version number based on the current date and time in local development. Because the version number would always be different between 2 Gradle invocations, some tasks, such as `javadoc` or `jar` could never be cached because they depend on the version number. With this patch, the version number will no longer include the date and time when the Git workspace is clean, because the commit hash is sufficient to uniquely identify the state of the workspace. This allows the tasks that depend on the version number to be properly cached.
Previously, the cache key of the antlr task would be computed using (among other things) the absolute paths of its input files. Because the absolute paths were part of the cache key, the build cache would rarely be hit. With this patch, the task is configured to use relative paths when computing the cache key.
…for unwrapped elements
…tion result in order to enforce directives in schema diff
Allow schema diff to use SDL document to enforce directives
…location-of-a-schema-elk The ability to get the source location of a schema element
Bumps [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) from 2.15.2 to 2.15.3. - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…erxml.jackson.core-jackson-databind-2.15.3 Bump com.fasterxml.jackson.core:jackson-databind from 2.15.2 to 2.15.3
Build cache fixes
…lds-aliaes-should-be-prevented Issue 3332 - overlapping aliases should be prevented
…tives #3267 clear directives schema usage bug fix
…locking removed synchronised from code base as much as possible for VT
Update DataLoader to 3.2.1
@OneOf handles non-null inputs
…tch_operation_to_schema_mismatch A test to show that validation rules do not catch a mutation query to schema mismatch
…query to schema mismatch"
…_validate-catch_operation_to_schema_mismatch Revert "A test to show that validation rules do not catch a mutation query to schema mismatch"
…l-in-21.3-commits # Conflicts: # build.gradle # src/test/groovy/graphql/introspection/IntrospectionTest.groovy # src/test/groovy/graphql/schema/idl/SchemaPrinterTest.groovy
andimarek
approved these changes
Mar 19, 2024
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 brings up the 21.x branch up to date with the last commit included in the 21.3 release, which was
42efd9b2on master 42efd9bYou can verify this PR correctly pulls in all master commits up to git tag 21.3 by comparing the last commit on this branch vs the 21.3 commit on master
https://github.com/graphql-java/graphql-java/compare/42efd9b2..a79bebf
This PR is necessary because we previously released 21.3 off the master branch