Repository: camel Updated Branches: refs/heads/master 617cfbb04 -> e6d75356d
CAMEL-11531 - set servlet dependency as provided CAMEL-11531 - fix for spring boot starter CAMEL-11531 - fix cs failures from db157f495f02c45d0a02017a367ab9e74096262f CAMEL-11531 - my cs fix CAMEL-11531 - my cs fix again Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/383bad07 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/383bad07 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/383bad07 Branch: refs/heads/master Commit: 383bad076fbbf0db4fe8afac55361b8b5d906caf Parents: db157f4 Author: onders86 <ondersez...@gmail.com> Authored: Thu Jul 20 14:19:26 2017 +0300 Committer: onders86 <ondersez...@gmail.com> Committed: Sat Jul 22 09:45:44 2017 +0300 ---------------------------------------------------------------------- components/camel-http-common/pom.xml | 1 + .../http/common/cookie/CookieHandlerTest.java | 30 +++++++++++--------- .../camel-servlet-starter/pom.xml | 12 ++++++++ 3 files changed, 29 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/383bad07/components/camel-http-common/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-http-common/pom.xml b/components/camel-http-common/pom.xml index 7207b19..bc0ccca 100644 --- a/components/camel-http-common/pom.xml +++ b/components/camel-http-common/pom.xml @@ -48,6 +48,7 @@ <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> <version>${javax.servlet-api-version}</version> + <scope>provided</scope> </dependency> <!-- testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/383bad07/components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java b/components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java index 32532b3..1ee9d61 100644 --- a/components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java +++ b/components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java @@ -36,6 +36,21 @@ import org.junit.runners.Parameterized.Parameters; @RunWith(Parameterized.class) public class CookieHandlerTest extends CamelTestSupport { + + private String uriStr; + private CookieHandler cookieHandler; + private CookiePolicy cookiePolicy; + private int expectedNumberOfCookieValues; + + private Exchange exchange; + + public CookieHandlerTest(CookieHandler cookieHandler, CookiePolicy cookiePolicy, String uri, int expectedNumberOfCookieValues, String description) { + this.cookieHandler = cookieHandler; + this.cookiePolicy = cookiePolicy; + this.uriStr = uri; + this.expectedNumberOfCookieValues = expectedNumberOfCookieValues; + } + /* * This test tries to set a cookie for domain .example.com from host * www.example.com or www.sub.example.com According to RFC 2965 section @@ -45,6 +60,7 @@ public class CookieHandlerTest extends CamelTestSupport { * version and one the (single) cookie. */ @Parameters(name = "{index}: {4} policy for {2} returns {3} Cookie header lines") + public static Iterable<Object[]> data() { return Arrays .asList(new Object[][] {{new InstanceCookieHandler(), CookiePolicy.ACCEPT_ORIGINAL_SERVER, "http://www.example.com/acme/foo";, 2, @@ -59,20 +75,6 @@ public class CookieHandlerTest extends CamelTestSupport { {new ExchangeCookieHandler(), CookiePolicy.ACCEPT_ALL, "http://www.sub.example.com/acme/foo";, 2, "ExchangeCookieHandler with ACCEPT_ALL"}}); } - private String uriStr; - private CookieHandler cookieHandler; - private CookiePolicy cookiePolicy; - private int expectedNumberOfCookieValues; - - private Exchange exchange; - - public CookieHandlerTest(CookieHandler cookieHandler, CookiePolicy cookiePolicy, String uri, int expectedNumberOfCookieValues, String description) { - this.cookieHandler = cookieHandler; - this.cookiePolicy = cookiePolicy; - this.uriStr = uri; - this.expectedNumberOfCookieValues = expectedNumberOfCookieValues; - } - @Before public void setUp() throws Exception { super.setUp(); http://git-wip-us.apache.org/repos/asf/camel/blob/383bad07/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml b/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml index ad9ed67..d1a9cae 100644 --- a/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml @@ -38,7 +38,19 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-servlet</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + </exclusion> + </exclusions> </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <!-- Test dependencies --> <dependency> <groupId>org.springframework.boot</groupId>
