Skip to content

Commit 5331b6c

Browse files
authored
Merge branch 'master' into version-22
2 parents 3a07889 + 9edd402 commit 5331b6c

File tree

6 files changed

+6
-9
lines changed

6 files changed

+6
-9
lines changed

.github/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ if [ "${FLAVOUR}" == 'javax' ]; then
1414
.github/add-javax-suffix.sh
1515
fi
1616

17-
./gradlew clean build publishToSonatype closeAndReleaseSonatypeStagingRepository
17+
./gradlew clean build publishToSonatype closeAndReleaseSonatypeStagingRepositories

.github/workflows/pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v4
12-
- uses: gradle/wrapper-validation-action@v2
12+
- uses: gradle/wrapper-validation-action@v3
1313

1414
test:
1515
name: Test run

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- uses: actions/checkout@v4
10-
- uses: gradle/wrapper-validation-action@v2
10+
- uses: gradle/wrapper-validation-action@v3
1111

1212
test-jakarta:
1313
name: Test run jakarta

.github/workflows/snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v4
13-
- uses: gradle/wrapper-validation-action@v2
13+
- uses: gradle/wrapper-validation-action@v3
1414

1515
test-jakarta:
1616
name: Test run jakarta

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ buildscript {
2828

2929
plugins {
3030
id "biz.aQute.bnd.builder" version "6.4.0" apply false
31-
id "org.sonarqube" version "4.4.1.3373"
31+
id "org.sonarqube" version "5.1.0.4882"
3232
id "jacoco"
33-
id "io.github.gradle-nexus.publish-plugin" version '1.3.0'
33+
id "io.github.gradle-nexus.publish-plugin" version '2.0.0'
3434
}
3535

3636
sonarqube {

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/error/DefaultGraphQLServletObjectMapperConfigurer.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.fasterxml.jackson.annotation.JsonInclude;
44
import com.fasterxml.jackson.databind.ObjectMapper;
55
import com.fasterxml.jackson.databind.SerializationFeature;
6-
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
76
import graphql.kickstart.execution.config.GraphQLServletObjectMapperConfigurer;
87

98
/** @author Andrew Potter */
@@ -12,9 +11,7 @@ public class DefaultGraphQLServletObjectMapperConfigurer
1211

1312
@Override
1413
public void configure(ObjectMapper mapper) {
15-
// default configuration for GraphQL Java Servlet
1614
mapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
17-
mapper.registerModule(new Jdk8Module());
1815
mapper.setDefaultPropertyInclusion(JsonInclude.Include.ALWAYS);
1916
}
2017
}

0 commit comments

Comments
 (0)