SHIRO-589 - Update Servlet Dependency to 3.1
Project: http://git-wip-us.apache.org/repos/asf/shiro/repo Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/c39a3678 Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/c39a3678 Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/c39a3678 Branch: refs/heads/master Commit: c39a3678bfc02e1c0d7563ce0c4c049902cf95f7 Parents: aa2cd4f Author: Brian Demers <bdem...@apache.org> Authored: Tue Sep 27 15:12:51 2016 -0400 Committer: Brian Demers <bdem...@apache.org> Committed: Tue Oct 18 11:46:00 2016 -0400 ---------------------------------------------------------------------- pom.xml | 6 +++--- samples/guice/pom.xml | 2 +- samples/spring-hibernate/pom.xml | 2 +- samples/spring/pom.xml | 2 +- samples/web/pom.xml | 2 +- support/guice/pom.xml | 2 +- support/spring/pom.xml | 2 +- web/pom.xml | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/shiro/blob/c39a3678/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8322e9b..88446e6 100644 --- a/pom.xml +++ b/pom.xml @@ -790,8 +790,8 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> + <artifactId>javax.servlet-api</artifactId> + <version>3.1.0</version> <scope>provided</scope> </dependency> <dependency> @@ -873,7 +873,7 @@ </exclusion> <exclusion> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> </exclusion> <exclusion> <groupId>jboss</groupId> http://git-wip-us.apache.org/repos/asf/shiro/blob/c39a3678/samples/guice/pom.xml ---------------------------------------------------------------------- diff --git a/samples/guice/pom.xml b/samples/guice/pom.xml index 27ac0b6..c6ee28a 100644 --- a/samples/guice/pom.xml +++ b/samples/guice/pom.xml @@ -71,7 +71,7 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/shiro/blob/c39a3678/samples/spring-hibernate/pom.xml ---------------------------------------------------------------------- diff --git a/samples/spring-hibernate/pom.xml b/samples/spring-hibernate/pom.xml index 0c1d586..88e06dd 100644 --- a/samples/spring-hibernate/pom.xml +++ b/samples/spring-hibernate/pom.xml @@ -105,7 +105,7 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/shiro/blob/c39a3678/samples/spring/pom.xml ---------------------------------------------------------------------- diff --git a/samples/spring/pom.xml b/samples/spring/pom.xml index ae70c73..90eb451 100644 --- a/samples/spring/pom.xml +++ b/samples/spring/pom.xml @@ -137,7 +137,7 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/shiro/blob/c39a3678/samples/web/pom.xml ---------------------------------------------------------------------- diff --git a/samples/web/pom.xml b/samples/web/pom.xml index dbb5d0e..c29648d 100644 --- a/samples/web/pom.xml +++ b/samples/web/pom.xml @@ -72,7 +72,7 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/shiro/blob/c39a3678/support/guice/pom.xml ---------------------------------------------------------------------- diff --git a/support/guice/pom.xml b/support/guice/pom.xml index 6dc9b98..0d2778b 100644 --- a/support/guice/pom.xml +++ b/support/guice/pom.xml @@ -60,7 +60,7 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/shiro/blob/c39a3678/support/spring/pom.xml ---------------------------------------------------------------------- diff --git a/support/spring/pom.xml b/support/spring/pom.xml index e169ffa..ff61e4b 100644 --- a/support/spring/pom.xml +++ b/support/spring/pom.xml @@ -42,7 +42,7 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/shiro/blob/c39a3678/web/pom.xml ---------------------------------------------------------------------- diff --git a/web/pom.xml b/web/pom.xml index 342c3dc..2971c9d 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -47,7 +47,7 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> </dependency> <!-- Test dependencies - scope set appropriately already in the parent pom--> <dependency>
