Merge pull request #153 from mlvandijk/master

Upgrade jackson and guava
graphql-java-kickstart · Feb 26, 2019 · f7874e0 · f7874e0
2 parents 0217361 + 51f15e9
commit f7874e0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ to see what's needed to create a Servlet with a schema.
 
 ## Using the latest development build
 
-Snapshot versions of the current `master` branch are availble on JFrog. Check the next snapshot version in 
+Snapshot versions of the current `master` branch are available on JFrog. Check the next snapshot version in
 [gradle.properties](https://github.com/graphql-java-kickstart/graphql-java-servlet/blob/master/gradle.properties).
 
 ### Build with Gradle

diff --git a/build.gradle b/build.gradle
@@ -33,7 +33,7 @@ dependencies {
     compile 'org.slf4j:slf4j-api:1.7.21'
 
     // Useful utilities
-    compile 'com.google.guava:guava:20.0'
+    compile 'com.google.guava:guava:24.1.1-jre'
 
     // Unit testing
     testCompile "org.codehaus.groovy:groovy-all:2.4.1"

diff --git a/examples/osgi/apache-karaf-feature/pom.xml b/examples/osgi/apache-karaf-feature/pom.xml
@@ -12,32 +12,37 @@
     <artifactId>graphql-java-servlet-osgi-examples-karaf-feature</artifactId>
     <packaging>feature</packaging>
 
-    <dependencies>
+    <properties>
+        <jackson.version>2.9.8</jackson.version>
+    </properties>
+
 
+
+    <dependencies>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.8.11</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.8.11</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.8.11</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jdk8</artifactId>
-            <version>2.8.11</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>20.0</version>
+            <version>24.1.1-jre</version>
         </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>

diff --git a/gradle.properties b/gradle.properties
@@ -2,4 +2,4 @@ version = 7.2.1-SNAPSHOT
 group = com.graphql-java-kickstart
 
 LIB_GRAPHQL_JAVA_VER = 11.0
-LIB_JACKSON_VER = 2.9.7
+LIB_JACKSON_VER = 2.9.8