Skip to content

Commit

Permalink
Remove uses of 'provided' in the eureka client (#1293)
Browse files Browse the repository at this point in the history
After updating gradle, we can stop using the deprecated 'provided' configuration.
This fixes an issue where the jackson-dataformat-xml and woodstox-core dependencies are affecting projects consuming eureka-client.
  • Loading branch information
drobertduke authored May 11, 2020
1 parent 80bf99f commit 0bf8579
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions eureka-client/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
apply plugin: 'nebula.test-jar'
apply plugin: 'nebula.provided-base'

configurations.all {
// jersey2
Expand Down Expand Up @@ -27,9 +26,9 @@ dependencies {
compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"

// Eureka client uses JSON encoding by default
provided "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jacksonVersion}"
compileOnly "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jacksonVersion}"
// Prefered jackson Stax serializer. Default Oracle has issues (adds empty namespace) and is slower
provided "com.fasterxml.woodstox:woodstox-core:${woodstoxVersion}"
compileOnly "com.fasterxml.woodstox:woodstox-core:${woodstoxVersion}"

runtime "org.codehaus.jettison:jettison:${jettisonVersion}"

Expand Down
2 changes: 1 addition & 1 deletion eureka-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
compile 'com.thoughtworks.xstream:xstream:1.4.11.1'
compile 'javax.ws.rs:jsr311-api:1.1.1'

// These dependencies are marked 'provided' in the client, but we need them always on the server
// These dependencies are marked 'compileOnly' in the client, but we need them always on the server
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jacksonVersion}"
compile "com.fasterxml.woodstox:woodstox-core:${woodstoxVersion}"

Expand Down

0 comments on commit 0bf8579

Please sign in to comment.