From 3740b29bcd3c15452fb6df1e7efc849d8dfdfdcc Mon Sep 17 00:00:00 2001 From: Ben Christensen Date: Fri, 14 Dec 2012 10:18:23 -0800 Subject: [PATCH 1/2] Make javax.servlet-api a 'provided' dependency for compilation but not transitive. Trying to make it so it doesn't force a servlet version or a specific jar. Nothing about the implementation requires anything higher than Servlet 2.x. --- hystrix-contrib/hystrix-metrics-event-stream/build.gradle | 2 +- hystrix-contrib/hystrix-request-servlet/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hystrix-contrib/hystrix-metrics-event-stream/build.gradle b/hystrix-contrib/hystrix-metrics-event-stream/build.gradle index 2d9970608..87d96c294 100644 --- a/hystrix-contrib/hystrix-metrics-event-stream/build.gradle +++ b/hystrix-contrib/hystrix-metrics-event-stream/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'java' dependencies { compile project(':hystrix-core') - compile 'javax.servlet:javax.servlet-api:3.0.1' compile 'org.codehaus.jackson:jackson-core-asl:1.9.2' + provided 'javax.servlet:javax.servlet-api:3.0.1' } diff --git a/hystrix-contrib/hystrix-request-servlet/build.gradle b/hystrix-contrib/hystrix-request-servlet/build.gradle index 384247447..0abe45899 100644 --- a/hystrix-contrib/hystrix-request-servlet/build.gradle +++ b/hystrix-contrib/hystrix-request-servlet/build.gradle @@ -1,5 +1,5 @@ apply plugin: 'java' dependencies { compile project(':hystrix-core') - compile 'javax.servlet:javax.servlet-api:3.0.1' + provided 'javax.servlet:javax.servlet-api:3.0.1' } From 278a379f0aad53f75e3f960bf8bbb3231f26c6fb Mon Sep 17 00:00:00 2001 From: Ben Christensen Date: Fri, 14 Dec 2012 11:16:50 -0800 Subject: [PATCH 2/2] Downgrade to Servlet 2.5 from 3.0 --- hystrix-contrib/hystrix-metrics-event-stream/build.gradle | 2 +- hystrix-contrib/hystrix-request-servlet/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hystrix-contrib/hystrix-metrics-event-stream/build.gradle b/hystrix-contrib/hystrix-metrics-event-stream/build.gradle index 87d96c294..68f8cc63d 100644 --- a/hystrix-contrib/hystrix-metrics-event-stream/build.gradle +++ b/hystrix-contrib/hystrix-metrics-event-stream/build.gradle @@ -2,5 +2,5 @@ dependencies { compile project(':hystrix-core') compile 'org.codehaus.jackson:jackson-core-asl:1.9.2' - provided 'javax.servlet:javax.servlet-api:3.0.1' + compile 'javax.servlet:servlet-api:2.5' } diff --git a/hystrix-contrib/hystrix-request-servlet/build.gradle b/hystrix-contrib/hystrix-request-servlet/build.gradle index 0abe45899..73485aca7 100644 --- a/hystrix-contrib/hystrix-request-servlet/build.gradle +++ b/hystrix-contrib/hystrix-request-servlet/build.gradle @@ -1,5 +1,5 @@ apply plugin: 'java' dependencies { compile project(':hystrix-core') - provided 'javax.servlet:javax.servlet-api:3.0.1' + compile 'javax.servlet:servlet-api:2.5' }