Skip to content

Commit 38c166b

Browse files
authored
Merge branch 'master' into master
2 parents c34b2ae + 5c15336 commit 38c166b

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Add jcenter to your repositories in `pom.xml` or `settings.xml`:
2828
<repositories>
2929
<repository>
3030
<id>jcenter</id>
31-
<url>http://jcenter.bintray.com</url>
31+
<url>https://jcenter.bintray.com</url>
3232
</repository>
3333
</repositories>
3434
```
@@ -66,7 +66,7 @@ dependencies {
6666
Add jcenter to your `resolvers` in your `build.sbt`:
6767

6868
```scala
69-
resolvers += "jcenter" at "http://jcenter.bintray.com"
69+
resolvers += "jcenter" at "https://jcenter.bintray.com"
7070
```
7171

7272
and add the project to your `libraryDependencies` in your `build.sbt`:
@@ -784,7 +784,7 @@ The client can be configured to accept any http stack that implements
784784
`java.net.HttpURLConnection` by implementing the `HttpConnectorSupplier`
785785
interface.
786786

787-
For example, to use [OkHttp](http://square.github.io/okhttp/) as a connection
787+
For example, to use [OkHttp](https://square.github.io/okhttp/) as a connection
788788
supplier, create a supplier class -
789789

790790
```java

build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ subprojects {
3434
}
3535

3636
ext {
37-
jacksonVersion = '2.9.6'
37+
jacksonVersion = '2.9.10'
38+
jacksonDatabindVersion = "$jacksonVersion.8"
3839
powermockVersion = '1.6.6'
3940
}
4041

@@ -50,7 +51,7 @@ subprojects {
5051
dependencies {
5152
compile "com.fasterxml.jackson.core:jackson-core:$jacksonVersion"
5253
compile "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion"
53-
compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
54+
compile "com.fasterxml.jackson.core:jackson-databind:$jacksonDatabindVersion"
5455
compile "com.google.guava:guava:17.0"
5556
compile "org.slf4j:slf4j-api:1.7.25"
5657
compile "commons-codec:commons-codec:1.9"

0 commit comments

Comments
 (0)