Skip to content

Commit

Permalink
switch to openfeign and bump version (#2006)
Browse files Browse the repository at this point in the history 
* switch to openfeign/okhttp3 and bump version

* fix for feign not liking default methods

* new feign improves their error messages!
  • Loading branch information
@clockfort @jeremyk-91
clockfort authored and jeremyk-91 committed Jun 15, 2017
1 parent 42690e0 commit 8e5862e
Show file tree
Hide file tree
Showing 40 changed files with 1,664 additions and 1,357 deletions.
96 changes: 54 additions & 42 deletions atlasdb-cassandra/versions.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
"com.fasterxml.jackson.module:jackson-module-afterburner",
"com.netflix.feign:feign-jackson",
"com.palantir.atlasdb:atlasdb-api",
"com.palantir.atlasdb:atlasdb-client",
"com.palantir.remoting2:jackson-support",
"com.palantir.remoting2:ssl-config",
"com.palantir.remoting2:tracing"
"com.palantir.remoting2:tracing",
"io.github.openfeign:feign-jackson"
]
},
"com.fasterxml.jackson.datatype:jackson-datatype-guava": {
Expand Down Expand Up @@ -139,25 +139,6 @@
"com.palantir.atlasdb:atlasdb-client"
]
},
"com.netflix.feign:feign-core": {
"locked": "8.6.1",
"transitive": [
"com.netflix.feign:feign-jackson",
"com.netflix.feign:feign-jaxrs"
]
},
"com.netflix.feign:feign-jackson": {
"locked": "8.6.1",
"transitive": [
"com.palantir.atlasdb:atlasdb-client"
]
},
"com.netflix.feign:feign-jaxrs": {
"locked": "8.6.1",
"transitive": [
"com.palantir.atlasdb:atlasdb-client"
]
},
"com.palantir.atlasdb:atlasdb-api": {
"project": true,
"transitive": [
Expand Down Expand Up @@ -299,6 +280,25 @@
"org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir"
]
},
"io.github.openfeign:feign-core": {
"locked": "9.5.0",
"transitive": [
"io.github.openfeign:feign-jackson",
"io.github.openfeign:feign-jaxrs"
]
},
"io.github.openfeign:feign-jackson": {
"locked": "9.5.0",
"transitive": [
"com.palantir.atlasdb:atlasdb-client"
]
},
"io.github.openfeign:feign-jaxrs": {
"locked": "9.5.0",
"transitive": [
"com.palantir.atlasdb:atlasdb-client"
]
},
"io.netty:netty-buffer": {
"locked": "4.0.27.Final",
"transitive": [
Expand Down Expand Up @@ -396,6 +396,12 @@
"locked": "1.4.11.Final",
"requested": "1.4.11.Final"
},
"org.jvnet:animal-sniffer-annotation": {
"locked": "1.0",
"transitive": [
"io.github.openfeign:feign-core"
]
},
"org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": {
"locked": "1.1.2",
"transitive": [
Expand Down Expand Up @@ -473,12 +479,12 @@
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
"com.fasterxml.jackson.module:jackson-module-afterburner",
"com.netflix.feign:feign-jackson",
"com.palantir.atlasdb:atlasdb-api",
"com.palantir.atlasdb:atlasdb-client",
"com.palantir.remoting2:jackson-support",
"com.palantir.remoting2:ssl-config",
"com.palantir.remoting2:tracing"
"com.palantir.remoting2:tracing",
"io.github.openfeign:feign-jackson"
]
},
"com.fasterxml.jackson.datatype:jackson-datatype-guava": {
Expand Down Expand Up @@ -577,25 +583,6 @@
"com.palantir.atlasdb:atlasdb-client"
]
},
"com.netflix.feign:feign-core": {
"locked": "8.6.1",
"transitive": [
"com.netflix.feign:feign-jackson",
"com.netflix.feign:feign-jaxrs"
]
},
"com.netflix.feign:feign-jackson": {
"locked": "8.6.1",
"transitive": [
"com.palantir.atlasdb:atlasdb-client"
]
},
"com.netflix.feign:feign-jaxrs": {
"locked": "8.6.1",
"transitive": [
"com.palantir.atlasdb:atlasdb-client"
]
},
"com.palantir.atlasdb:atlasdb-api": {
"project": true,
"transitive": [
Expand Down Expand Up @@ -737,6 +724,25 @@
"org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir"
]
},
"io.github.openfeign:feign-core": {
"locked": "9.5.0",
"transitive": [
"io.github.openfeign:feign-jackson",
"io.github.openfeign:feign-jaxrs"
]
},
"io.github.openfeign:feign-jackson": {
"locked": "9.5.0",
"transitive": [
"com.palantir.atlasdb:atlasdb-client"
]
},
"io.github.openfeign:feign-jaxrs": {
"locked": "9.5.0",
"transitive": [
"com.palantir.atlasdb:atlasdb-client"
]
},
"io.netty:netty-buffer": {
"locked": "4.0.27.Final",
"transitive": [
Expand Down Expand Up @@ -834,6 +840,12 @@
"locked": "1.4.11.Final",
"requested": "1.4.11.Final"
},
"org.jvnet:animal-sniffer-annotation": {
"locked": "1.0",
"transitive": [
"io.github.openfeign:feign-core"
]
},
"org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": {
"locked": "1.1.2",
"transitive": [
Expand Down
76 changes: 41 additions & 35 deletions atlasdb-cli-distribution/versions.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
"com.fasterxml.jackson.datatype:jackson-datatype-joda",
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
"com.fasterxml.jackson.module:jackson-module-afterburner",
"com.netflix.feign:feign-jackson",
"com.palantir.atlasdb:atlasdb-api",
"com.palantir.atlasdb:atlasdb-client",
"com.palantir.atlasdb:atlasdb-config",
Expand All @@ -83,7 +82,8 @@
"com.palantir.remoting2:jackson-support",
"com.palantir.remoting2:ssl-config",
"com.palantir.remoting2:tracing",
"io.dropwizard:dropwizard-jackson"
"io.dropwizard:dropwizard-jackson",
"io.github.openfeign:feign-jackson"
]
},
"com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": {
Expand Down Expand Up @@ -253,34 +253,6 @@
"com.mchange:c3p0"
]
},
"com.netflix.feign:feign-core": {
"locked": "8.6.1",
"transitive": [
"com.netflix.feign:feign-jackson",
"com.netflix.feign:feign-jaxrs",
"com.netflix.feign:feign-okhttp"
]
},
"com.netflix.feign:feign-jackson": {
"locked": "8.6.1",
"transitive": [
"com.palantir.atlasdb:atlasdb-client",
"com.palantir.atlasdb:atlasdb-config"
]
},
"com.netflix.feign:feign-jaxrs": {
"locked": "8.6.1",
"transitive": [
"com.palantir.atlasdb:atlasdb-client",
"com.palantir.atlasdb:atlasdb-config"
]
},
"com.netflix.feign:feign-okhttp": {
"locked": "8.10.1",
"transitive": [
"com.palantir.atlasdb:atlasdb-config"
]
},
"com.palantir.atlasdb:atlasdb-api": {
"project": true,
"transitive": [
Expand Down Expand Up @@ -593,16 +565,16 @@
"com.palantir.tritium:tritium-lib"
]
},
"com.squareup.okhttp:okhttp": {
"locked": "2.5.0",
"com.squareup.okhttp3:okhttp": {
"locked": "3.6.0",
"transitive": [
"com.netflix.feign:feign-okhttp"
"io.github.openfeign:feign-okhttp"
]
},
"com.squareup.okio:okio": {
"locked": "1.6.0",
"locked": "1.11.0",
"transitive": [
"com.squareup.okhttp:okhttp"
"com.squareup.okhttp3:okhttp"
]
},
"com.zaxxer:HikariCP": {
Expand Down Expand Up @@ -670,6 +642,34 @@
"io.dropwizard:dropwizard-jackson"
]
},
"io.github.openfeign:feign-core": {
"locked": "9.5.0",
"transitive": [
"io.github.openfeign:feign-jackson",
"io.github.openfeign:feign-jaxrs",
"io.github.openfeign:feign-okhttp"
]
},
"io.github.openfeign:feign-jackson": {
"locked": "9.5.0",
"transitive": [
"com.palantir.atlasdb:atlasdb-client",
"com.palantir.atlasdb:atlasdb-config"
]
},
"io.github.openfeign:feign-jaxrs": {
"locked": "9.5.0",
"transitive": [
"com.palantir.atlasdb:atlasdb-client",
"com.palantir.atlasdb:atlasdb-config"
]
},
"io.github.openfeign:feign-okhttp": {
"locked": "9.5.0",
"transitive": [
"com.palantir.atlasdb:atlasdb-config"
]
},
"io.netty:netty-buffer": {
"locked": "4.0.27.Final",
"transitive": [
Expand Down Expand Up @@ -808,6 +808,12 @@
"com.palantir.atlasdb:atlasdb-jdbc"
]
},
"org.jvnet:animal-sniffer-annotation": {
"locked": "1.0",
"transitive": [
"io.github.openfeign:feign-core"
]
},
"org.mortbay.jetty.alpn:jetty-alpn-agent": {
"locked": "2.0.6",
"transitive": [
Expand Down
Loading

0 comments on commit 8e5862e

Please sign in to comment.