Skip to content

Commit f7874e0

Browse files
authored
Merge pull request #153 from mlvandijk/master
Upgrade jackson and guava
2 parents 0217361 + 51f15e9 commit f7874e0

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ to see what's needed to create a Servlet with a schema.
5454

5555
## Using the latest development build
5656

57-
Snapshot versions of the current `master` branch are availble on JFrog. Check the next snapshot version in
57+
Snapshot versions of the current `master` branch are available on JFrog. Check the next snapshot version in
5858
[gradle.properties](https://github.com/graphql-java-kickstart/graphql-java-servlet/blob/master/gradle.properties).
5959

6060
### Build with Gradle

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies {
3333
compile 'org.slf4j:slf4j-api:1.7.21'
3434

3535
// Useful utilities
36-
compile 'com.google.guava:guava:20.0'
36+
compile 'com.google.guava:guava:24.1.1-jre'
3737

3838
// Unit testing
3939
testCompile "org.codehaus.groovy:groovy-all:2.4.1"

examples/osgi/apache-karaf-feature/pom.xml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,37 @@
1212
<artifactId>graphql-java-servlet-osgi-examples-karaf-feature</artifactId>
1313
<packaging>feature</packaging>
1414

15-
<dependencies>
15+
<properties>
16+
<jackson.version>2.9.8</jackson.version>
17+
</properties>
18+
1619

20+
21+
<dependencies>
1722
<dependency>
1823
<groupId>com.fasterxml.jackson.core</groupId>
1924
<artifactId>jackson-core</artifactId>
20-
<version>2.8.11</version>
25+
<version>${jackson.version}</version>
2126
</dependency>
2227
<dependency>
2328
<groupId>com.fasterxml.jackson.core</groupId>
2429
<artifactId>jackson-annotations</artifactId>
25-
<version>2.8.11</version>
30+
<version>${jackson.version}</version>
2631
</dependency>
2732
<dependency>
2833
<groupId>com.fasterxml.jackson.core</groupId>
2934
<artifactId>jackson-databind</artifactId>
30-
<version>2.8.11</version>
35+
<version>${jackson.version}</version>
3136
</dependency>
3237
<dependency>
3338
<groupId>com.fasterxml.jackson.datatype</groupId>
3439
<artifactId>jackson-datatype-jdk8</artifactId>
35-
<version>2.8.11</version>
40+
<version>${jackson.version}</version>
3641
</dependency>
3742
<dependency>
3843
<groupId>com.google.guava</groupId>
3944
<artifactId>guava</artifactId>
40-
<version>20.0</version>
45+
<version>24.1.1-jre</version>
4146
</dependency>
4247
<dependency>
4348
<groupId>commons-fileupload</groupId>

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ version = 7.2.1-SNAPSHOT
22
group = com.graphql-java-kickstart
33

44
LIB_GRAPHQL_JAVA_VER = 11.0
5-
LIB_JACKSON_VER = 2.9.7
5+
LIB_JACKSON_VER = 2.9.8

0 commit comments

Comments
 (0)