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/19158022
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/19158022
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/19158022

Branch: refs/heads/1.4.x
Commit: 19158022f2bc5632a78bf18830c1df8ed361cb74
Parents: cd3dde8
Author: Brian Demers <bdem...@apache.org>
Authored: Tue Sep 27 15:12:51 2016 -0400
Committer: Brian Demers <bdem...@apache.org>
Committed: Fri Oct 14 15:15:50 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/19158022/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b219d6b..02f837a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -703,8 +703,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>
@@ -786,7 +786,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/19158022/samples/guice/pom.xml
----------------------------------------------------------------------
diff --git a/samples/guice/pom.xml b/samples/guice/pom.xml
index ed3e287..ff6b52c 100644
--- a/samples/guice/pom.xml
+++ b/samples/guice/pom.xml
@@ -69,7 +69,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/19158022/samples/spring-hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/samples/spring-hibernate/pom.xml b/samples/spring-hibernate/pom.xml
index 8ab9367..0f84239 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/19158022/samples/spring/pom.xml
----------------------------------------------------------------------
diff --git a/samples/spring/pom.xml b/samples/spring/pom.xml
index 70b6e69..30361fa 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/19158022/samples/web/pom.xml
----------------------------------------------------------------------
diff --git a/samples/web/pom.xml b/samples/web/pom.xml
index a06352b..a875aa6 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/19158022/support/guice/pom.xml
----------------------------------------------------------------------
diff --git a/support/guice/pom.xml b/support/guice/pom.xml
index 9e0849d..78a97f8 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/19158022/support/spring/pom.xml
----------------------------------------------------------------------
diff --git a/support/spring/pom.xml b/support/spring/pom.xml
index 60f69cd..3aa7155 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/19158022/web/pom.xml
----------------------------------------------------------------------
diff --git a/web/pom.xml b/web/pom.xml
index 6c55ff6..b84b426 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>

Reply via email to