Skip to content

Commit a7f8409

Browse files
authored
Merge pull request #4 from sergehuber/quick-fixes
Servlet API downgrade, correction in groupId and made some service references optional
2 parents cc6027d + 9bbcc5a commit a7f8409

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ publishing {
6565
publications {
6666
MyPublication(MavenPublication) {
6767
from components.java
68-
groupId 'graphql-java-servlet'
68+
groupId 'com.graphql-java'
6969
artifactId project.name
7070
version project.version
7171

@@ -112,7 +112,7 @@ dependencies {
112112
compile 'biz.aQute.bnd:biz.aQute.bndlib:3.1.0'
113113

114114
// Servlet
115-
compile 'javax.servlet:javax.servlet-api:3.1.0'
115+
compile 'javax.servlet:javax.servlet-api:3.0.1'
116116
// Multipart support
117117
compile 'commons-fileupload:commons-fileupload:1.3.1'
118118

src/main/java/graphql/servlet/GraphQLServlet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,15 @@ public String[] getMutations() {
131131
private GraphQLContextBuilder contextBuilder = new DefaultGraphQLContextBuilder();
132132
private ExecutionStrategyProvider executionStrategyProvider = new EnhancedExecutionStrategyProvider();
133133

134-
@Reference
134+
@Reference(cardinality = ReferenceCardinality.OPTIONAL)
135135
public void setContextProvider(GraphQLContextBuilder contextBuilder) {
136136
this.contextBuilder = contextBuilder;
137137
}
138138
public void unsetContextProvider(GraphQLContextBuilder contextBuilder) {
139139
this.contextBuilder = new DefaultGraphQLContextBuilder();
140140
}
141141

142-
@Reference
142+
@Reference(cardinality = ReferenceCardinality.OPTIONAL)
143143
public void setExecutionStrategyProvider(ExecutionStrategyProvider provider) {
144144
executionStrategyProvider = provider;
145145
}

0 commit comments

Comments
 (0)