Skip to content

Commit 85dc85e

Browse files
committed
Component upgrades.
1 parent 75dc0e7 commit 85dc85e

4 files changed

Lines changed: 30 additions & 17 deletions

File tree

.github/workflows/build.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ jobs:
4242
run: sudo apt install graphviz
4343

4444
- name: build with maven
45-
run: ./mvnw -B formatter:validate impsort:check javadoc:javadoc install --file pom.xml
45+
run: GITHUB_ACTION_REPOSITORY=whatever GITHUB_ACTION_REF=whatever ./mvnw -B formatter:validate impsort:check javadoc:javadoc install --file pom.xml
46+
# the GITHUB* properties are a workaround for Stork whose MicroProfileConfigProvider blows up when it sees an empty property
4647

4748
wildfly-tests:
4849
runs-on: ubuntu-latest
@@ -58,8 +59,8 @@ jobs:
5859
- name: checkout WildFly feature pack repository
5960
uses: actions/checkout@v2
6061
with:
61-
repository: wildfly-extras/wildfly-graphql-feature-pack
62-
ref: main
62+
repository: jmartisk/wildfly-graphql-feature-pack
63+
ref: srgql-2.16.0
6364
path: wildfly-graphql-feature-pack
6465

6566
- uses: actions/setup-java@v5
@@ -97,8 +98,8 @@ jobs:
9798
- name: checkout Quarkus repository
9899
uses: actions/checkout@v2
99100
with:
100-
repository: quarkusio/quarkus
101-
ref: main
101+
repository: jmartisk/quarkus
102+
ref: srgql-2.16.0
102103
path: quarkus
103104

104105
- uses: actions/setup-java@v5

pom.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,24 @@
2424
<version.jandex>3.1.2</version.jandex>
2525
<version.smallrye-config>3.5.2</version.smallrye-config>
2626
<version.smallrye.metrics>4.0.0</version.smallrye.metrics>
27-
<version.smallrye-common>2.1.0</version.smallrye-common>
28-
<version.smallrye-mutiny>2.3.1</version.smallrye-mutiny>
29-
<version.smallrye-mutiny-zero>1.0.0</version.smallrye-mutiny-zero>
27+
<version.smallrye-common>2.13.9</version.smallrye-common>
28+
<version.smallrye-mutiny>3.0.0</version.smallrye-mutiny>
29+
<version.smallrye-mutiny-zero>1.1.1</version.smallrye-mutiny-zero>
3030
<version.smallrye-context-propagation>2.1.0</version.smallrye-context-propagation>
31-
<version.smallrye-stork>2.3.2</version.smallrye-stork>
31+
<version.smallrye-stork>2.7.6</version.smallrye-stork>
3232

3333
<version.jakarta-json>2.1.2</version.jakarta-json>
3434
<version.yasson>3.0.4</version.yasson>
3535
<version.jakarta-validation>3.0.2</version.jakarta-validation>
3636
<version.jakarta-annotation>2.1.1</version.jakarta-annotation>
3737
<version.jakarta.servlet>6.0.0</version.jakarta.servlet>
3838
<version.jakarta.websocket>2.0.0</version.jakarta.websocket>
39-
<version.graphql-java-federation>4.4.0</version.graphql-java-federation>
40-
<version.graphql-java>22.2</version.graphql-java>
41-
<version.extended-scalars>21.0</version.extended-scalars>
42-
<verison.io.micrometer>1.14.7</verison.io.micrometer>
39+
<version.graphql-java-federation>5.4.0</version.graphql-java-federation>
40+
<version.graphql-java>24.3</version.graphql-java>
41+
<version.extended-scalars>24.0</version.extended-scalars>
42+
<verison.io.micrometer>1.15.4</verison.io.micrometer>
4343
<version.vertx>4.5.4</version.vertx>
44-
<version.smallrye-opentelemetry>2.4.0</version.smallrye-opentelemetry>
44+
<version.smallrye-opentelemetry>2.10.1</version.smallrye-opentelemetry>
4545

4646

4747
<!-- Test -->

server/implementation/src/main/java/io/smallrye/graphql/execution/ExecutionService.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,9 @@ private <KEY, VALUE> DataLoader<KEY, VALUE> getDataLoaderForOperation(Operation
302302
if (operationUsesNoArguments(operation)) {
303303
return DataLoaderFactory.newDataLoader(batchLoader);
304304
}
305-
DataLoaderOptions loaderOptions = new DataLoaderOptions();
306-
loaderOptions.setCacheKeyFunction(this.getCacheKeyFunction());
305+
DataLoaderOptions loaderOptions = DataLoaderOptions.newOptions()
306+
.setCacheKeyFunction(this.getCacheKeyFunction())
307+
.build();
307308
return DataLoaderFactory.newDataLoader(batchLoader, loaderOptions);
308309
}
309310

server/implementation/src/test/resources/schemaTest.graphql

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,23 @@ directive @argumentDirective on ARGUMENT_DEFINITION
33
"Indicates a Bean Validation constraint"
44
directive @constraint(format: String, max: BigInteger, maxFloat: BigDecimal, maxLength: Int, min: BigInteger, minFloat: BigDecimal, minLength: Int, pattern: String) repeatable on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION
55

6+
"This directive allows results to be deferred during execution"
7+
directive @defer(
8+
"Deferred behaviour is controlled by this argument"
9+
if: Boolean! = true,
10+
"A unique label that represents the fragment being deferred"
11+
label: String
12+
) on FRAGMENT_SPREAD | INLINE_FRAGMENT
13+
614
"Marks the field, argument, input field or enum value as deprecated"
715
directive @deprecated(
816
"The reason for the deprecation"
9-
reason: String = "No longer supported"
17+
reason: String! = "No longer supported"
1018
) on FIELD_DEFINITION | ARGUMENT_DEFINITION | ENUM_VALUE | INPUT_FIELD_DEFINITION
1119

20+
"This directive disables error propagation when a non nullable field returns null for the given operation."
21+
directive @experimental_disableErrorPropagation on QUERY | MUTATION | SUBSCRIPTION
22+
1223
directive @fieldDirective on FIELD_DEFINITION
1324

1425
"Directs the executor to include this field or fragment only when the `if` argument is true"

0 commit comments

Comments
 (0)