diff --git a/access/access-impl/impl/pom.xml b/access/access-impl/impl/pom.xml
index f9174fbffee9..1623f531d351 100644
--- a/access/access-impl/impl/pom.xml
+++ b/access/access-impl/impl/pom.xml
@@ -26,7 +26,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
diff --git a/admin-tools/pom.xml b/admin-tools/pom.xml
index c4fb15d64dea..3e8eda8cfb33 100644
--- a/admin-tools/pom.xml
+++ b/admin-tools/pom.xml
@@ -19,7 +19,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.kernel</groupId>
diff --git a/announcement/announcement-impl/impl/pom.xml b/announcement/announcement-impl/impl/pom.xml
index 1dce8b89e191..74bef5e64ba9 100644
--- a/announcement/announcement-impl/impl/pom.xml
+++ b/announcement/announcement-impl/impl/pom.xml
@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>xerces</groupId>
diff --git a/announcement/announcement-tool/tool/pom.xml b/announcement/announcement-tool/tool/pom.xml
index dc0144dcada5..42108c850c10 100644
--- a/announcement/announcement-tool/tool/pom.xml
+++ b/announcement/announcement-tool/tool/pom.xml
@@ -70,7 +70,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/assignment/impl/pom.xml b/assignment/impl/pom.xml
index b1433cb130f1..9376ccfb4ff6 100644
--- a/assignment/impl/pom.xml
+++ b/assignment/impl/pom.xml
@@ -94,7 +94,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
diff --git a/assignment/tool/pom.xml b/assignment/tool/pom.xml
index 54487b3e6f32..a392cab5062b 100644
--- a/assignment/tool/pom.xml
+++ b/assignment/tool/pom.xml
@@ -111,7 +111,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
diff --git a/basiclti/basiclti-blis/pom.xml b/basiclti/basiclti-blis/pom.xml
index f50dbf16fe66..71448bacd57b 100644
--- a/basiclti/basiclti-blis/pom.xml
+++ b/basiclti/basiclti-blis/pom.xml
@@ -53,7 +53,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.portlet</groupId>
diff --git a/basiclti/basiclti-common/pom.xml b/basiclti/basiclti-common/pom.xml
index 47ec1d046eb0..edfc5d3165ec 100644
--- a/basiclti/basiclti-common/pom.xml
+++ b/basiclti/basiclti-common/pom.xml
@@ -76,7 +76,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
diff --git a/basiclti/basiclti-impl/pom.xml b/basiclti/basiclti-impl/pom.xml
index 3c2a0b611de1..49dd0d484ed4 100644
--- a/basiclti/basiclti-impl/pom.xml
+++ b/basiclti/basiclti-impl/pom.xml
@@ -70,7 +70,7 @@
 		</dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hsqldb</groupId>
diff --git a/basiclti/basiclti-portlet/pom.xml b/basiclti/basiclti-portlet/pom.xml
index 94cf692a3a1a..1ee143d4fdee 100644
--- a/basiclti/basiclti-portlet/pom.xml
+++ b/basiclti/basiclti-portlet/pom.xml
@@ -49,7 +49,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.portlet</groupId>
diff --git a/basiclti/basiclti-tool/pom.xml b/basiclti/basiclti-tool/pom.xml
index 3f77d43fe14c..6c2bfc473104 100644
--- a/basiclti/basiclti-tool/pom.xml
+++ b/basiclti/basiclti-tool/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.kernel</groupId>
diff --git a/basiclti/portlet-util/pom.xml b/basiclti/portlet-util/pom.xml
index 32c01dc21f69..003e5e258fa7 100644
--- a/basiclti/portlet-util/pom.xml
+++ b/basiclti/portlet-util/pom.xml
@@ -21,13 +21,12 @@
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.portlet</groupId>
             <artifactId>portlet-api</artifactId>
-            <version>1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/basiclti/tsugi-util/pom-tsugi.xml b/basiclti/tsugi-util/pom-tsugi.xml
index a5eca8c013cc..19e0361d85af 100644
--- a/basiclti/tsugi-util/pom-tsugi.xml
+++ b/basiclti/tsugi-util/pom-tsugi.xml
@@ -20,8 +20,7 @@
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
       <dependency>
diff --git a/basiclti/tsugi-util/pom.xml b/basiclti/tsugi-util/pom.xml
index 7cac8bb0a559..bdaf670e2116 100644
--- a/basiclti/tsugi-util/pom.xml
+++ b/basiclti/tsugi-util/pom.xml
@@ -23,7 +23,7 @@
             Sakai-specific code needs to be placed in the basiclti-common folder -->
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
diff --git a/basiclti/web-ifp/pom.xml b/basiclti/web-ifp/pom.xml
index 3f49f16771a9..fdf968314a7d 100644
--- a/basiclti/web-ifp/pom.xml
+++ b/basiclti/web-ifp/pom.xml
@@ -42,12 +42,11 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
     <dependency>
       <groupId>javax.portlet</groupId>
       <artifactId>portlet-api</artifactId>
-      <version>1.0</version>
     </dependency>
 <!-- velocity and dependencies (logkit, oro, collections) -->
     <dependency>
diff --git a/calendar/calendar-impl/impl/pom.xml b/calendar/calendar-impl/impl/pom.xml
index e3f50cfa3984..ba8fa3add693 100644
--- a/calendar/calendar-impl/impl/pom.xml
+++ b/calendar/calendar-impl/impl/pom.xml
@@ -66,7 +66,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
diff --git a/calendar/calendar-tool/tool/pom.xml b/calendar/calendar-tool/tool/pom.xml
index e0939a19d7cb..0354df0619ba 100644
--- a/calendar/calendar-tool/tool/pom.xml
+++ b/calendar/calendar-tool/tool/pom.xml
@@ -66,7 +66,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/calendar/calendar-util/util/pom.xml b/calendar/calendar-util/util/pom.xml
index 4ff8bdc5826e..558236bb4490 100644
--- a/calendar/calendar-util/util/pom.xml
+++ b/calendar/calendar-util/util/pom.xml
@@ -65,7 +65,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/chat/chat-impl/impl/pom.xml b/chat/chat-impl/impl/pom.xml
index 261790ad8a00..bd4723140256 100644
--- a/chat/chat-impl/impl/pom.xml
+++ b/chat/chat-impl/impl/pom.xml
@@ -28,7 +28,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
diff --git a/chat/chat-tool/tool/pom.xml b/chat/chat-tool/tool/pom.xml
index 4ceded0c3017..f3ce95394850 100644
--- a/chat/chat-tool/tool/pom.xml
+++ b/chat/chat-tool/tool/pom.xml
@@ -23,7 +23,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
diff --git a/citations/citations-api/api/pom.xml b/citations/citations-api/api/pom.xml
index 8c952f64da77..2440d82e5248 100644
--- a/citations/citations-api/api/pom.xml
+++ b/citations/citations-api/api/pom.xml
@@ -36,7 +36,7 @@
 <!--org.sakaiprojectsakai-util-api${sakai.version}-->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>OKI</groupId>
diff --git a/citations/citations-impl/impl/pom.xml b/citations/citations-impl/impl/pom.xml
index 5b23edec28f8..07c20e13f081 100644
--- a/citations/citations-impl/impl/pom.xml
+++ b/citations/citations-impl/impl/pom.xml
@@ -22,7 +22,7 @@
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
@@ -113,12 +113,6 @@
       <artifactId>spring-context</artifactId>
      <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.0.1</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
      <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
diff --git a/citations/citations-osid/web2bridge/pom.xml b/citations/citations-osid/web2bridge/pom.xml
index c0acf8fcd089..1a98ff30855d 100644
--- a/citations/citations-osid/web2bridge/pom.xml
+++ b/citations/citations-osid/web2bridge/pom.xml
@@ -24,7 +24,7 @@
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
diff --git a/citations/citations-servlet/servlet/pom.xml b/citations/citations-servlet/servlet/pom.xml
index c573b2d877e3..0f56f4312364 100644
--- a/citations/citations-servlet/servlet/pom.xml
+++ b/citations/citations-servlet/servlet/pom.xml
@@ -23,7 +23,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
diff --git a/citations/citations-tool/tool/pom.xml b/citations/citations-tool/tool/pom.xml
index c4e18138523b..2c45632bbfe7 100644
--- a/citations/citations-tool/tool/pom.xml
+++ b/citations/citations-tool/tool/pom.xml
@@ -23,7 +23,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
diff --git a/common/import-handlers/content-handlers/pom.xml b/common/import-handlers/content-handlers/pom.xml
index 06101fdb2a22..8e725854ba36 100644
--- a/common/import-handlers/content-handlers/pom.xml
+++ b/common/import-handlers/content-handlers/pom.xml
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>javax.activation</groupId>
-      <artifactId>activation</artifactId>
+      <artifactId>javax.activation-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.common</groupId>
diff --git a/common/import-impl/pom.xml b/common/import-impl/pom.xml
index 4bb067c34776..b69da63af986 100644
--- a/common/import-impl/pom.xml
+++ b/common/import-impl/pom.xml
@@ -25,7 +25,7 @@
     </dependency>
     <dependency>
       <groupId>javax.activation</groupId>
-      <artifactId>activation</artifactId>
+      <artifactId>javax.activation-api</artifactId>
     </dependency>
     <dependency>
       <groupId>jaxen</groupId>
diff --git a/common/import-util/pom.xml b/common/import-util/pom.xml
index 01d9e9f44f62..2e915213dfd3 100644
--- a/common/import-util/pom.xml
+++ b/common/import-util/pom.xml
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>javax.activation</groupId>
-      <artifactId>activation</artifactId>
+      <artifactId>javax.activation-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.common</groupId>
diff --git a/commons/impl/pom.xml b/commons/impl/pom.xml
index aba0dd9e40dc..8bc9c2c38b3d 100644
--- a/commons/impl/pom.xml
+++ b/commons/impl/pom.xml
@@ -21,7 +21,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.kernel</groupId>
diff --git a/commons/tool/pom.xml b/commons/tool/pom.xml
index 61f52c0d5b55..9dd46b36a3b7 100644
--- a/commons/tool/pom.xml
+++ b/commons/tool/pom.xml
@@ -50,7 +50,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
diff --git a/content-review/api/pom.xml b/content-review/api/pom.xml
index fe08ce0ad9c1..cd67b3a95aff 100644
--- a/content-review/api/pom.xml
+++ b/content-review/api/pom.xml
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
 	        <groupId>javax.servlet</groupId>
-	        <artifactId>servlet-api</artifactId>
+	        <artifactId>javax.servlet-api</artifactId>
 	    </dependency>
     </dependencies>
 </project>
diff --git a/content-review/impl/compilatio/pom.xml b/content-review/impl/compilatio/pom.xml
index 8616ef07832c..d15277432ffd 100644
--- a/content-review/impl/compilatio/pom.xml
+++ b/content-review/impl/compilatio/pom.xml
@@ -50,7 +50,7 @@
 		</dependency>
 		<dependency>
 	        <groupId>javax.servlet</groupId>
-	        <artifactId>servlet-api</artifactId>
+	        <artifactId>javax.servlet-api</artifactId>
 	    </dependency>
 		<!-- Apache commons dependencies -->
 		<dependency>
diff --git a/content-review/impl/service/pom.xml b/content-review/impl/service/pom.xml
index 60ea18640fee..484ba31e10f2 100644
--- a/content-review/impl/service/pom.xml
+++ b/content-review/impl/service/pom.xml
@@ -67,7 +67,7 @@
         </dependency>
         <dependency>
 	        <groupId>javax.servlet</groupId>
-	        <artifactId>servlet-api</artifactId>
+	        <artifactId>javax.servlet-api</artifactId>
 	    </dependency>
 	</dependencies>
 </project>
diff --git a/content-review/impl/turnitin-oc/pom.xml b/content-review/impl/turnitin-oc/pom.xml
index c9af2c7cdb07..190f3ca23ed0 100644
--- a/content-review/impl/turnitin-oc/pom.xml
+++ b/content-review/impl/turnitin-oc/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>
 
diff --git a/content-review/impl/turnitin/pom.xml b/content-review/impl/turnitin/pom.xml
index 146ddb36a6d5..67f985fdb8d8 100644
--- a/content-review/impl/turnitin/pom.xml
+++ b/content-review/impl/turnitin/pom.xml
@@ -134,7 +134,7 @@
         </dependency>
         <dependency>
 	        <groupId>javax.servlet</groupId>
-	        <artifactId>servlet-api</artifactId>
+	        <artifactId>javax.servlet-api</artifactId>
 	    </dependency>
 	</dependencies>
 </project>
diff --git a/content-review/impl/urkund/pom.xml b/content-review/impl/urkund/pom.xml
index 354933eef9fb..1681d77fa252 100644
--- a/content-review/impl/urkund/pom.xml
+++ b/content-review/impl/urkund/pom.xml
@@ -94,7 +94,7 @@
 		</dependency>
 		<dependency>
 	        <groupId>javax.servlet</groupId>
-	        <artifactId>servlet-api</artifactId>
+	        <artifactId>javax.servlet-api</artifactId>
 	    </dependency>
 
 		<!-- Spring and Hibernate dependencies. -->
diff --git a/content-review/impl/vericite/pom.xml b/content-review/impl/vericite/pom.xml
index 08604a49fc35..cc83dcda5c27 100644
--- a/content-review/impl/vericite/pom.xml
+++ b/content-review/impl/vericite/pom.xml
@@ -61,7 +61,7 @@
                 </dependency>
         <dependency>
 	        <groupId>javax.servlet</groupId>
-	        <artifactId>servlet-api</artifactId>
+	        <artifactId>javax.servlet-api</artifactId>
 	    </dependency>
 		<!-- HTTP client: jersey-client -->
                 <dependency>
diff --git a/content-review/tool/pom.xml b/content-review/tool/pom.xml
index 3dd38466f420..0ffb19d09dc5 100644
--- a/content-review/tool/pom.xml
+++ b/content-review/tool/pom.xml
@@ -25,7 +25,7 @@
     <!-- we are running a webapp in a servlet container so we need the servlet API -->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <!-- third party dependencies -->
diff --git a/content/content-tool/tool/pom.xml b/content/content-tool/tool/pom.xml
index 43e102619ed9..9a40abff19a9 100644
--- a/content/content-tool/tool/pom.xml
+++ b/content/content-tool/tool/pom.xml
@@ -27,7 +27,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
diff --git a/courier/courier-tool/tool/pom.xml b/courier/courier-tool/tool/pom.xml
index 1249ea678155..f8b7a3f251a4 100644
--- a/courier/courier-tool/tool/pom.xml
+++ b/courier/courier-tool/tool/pom.xml
@@ -34,7 +34,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
     </dependencies>
     
diff --git a/dav/dav/pom.xml b/dav/dav/pom.xml
index b8ff0c03dc41..848088779cf3 100644
--- a/dav/dav/pom.xml
+++ b/dav/dav/pom.xml
@@ -23,7 +23,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.kernel</groupId>
diff --git a/deploy/pom.xml b/deploy/pom.xml
index b06e6d0b06cc..acb47b241d6e 100644
--- a/deploy/pom.xml
+++ b/deploy/pom.xml
@@ -586,7 +586,7 @@
         </dependency>
         <dependency>
             <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
+            <artifactId>javax.activation-api</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/edu-services/gradebook-service/impl/pom.xml b/edu-services/gradebook-service/impl/pom.xml
index 22052041e5f7..b2c40578ad92 100644
--- a/edu-services/gradebook-service/impl/pom.xml
+++ b/edu-services/gradebook-service/impl/pom.xml
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/entitybroker/api/pom.xml b/entitybroker/api/pom.xml
index 60a360138048..d5381be44edc 100644
--- a/entitybroker/api/pom.xml
+++ b/entitybroker/api/pom.xml
@@ -23,7 +23,7 @@
 <!-- external dependencies -->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
   </dependencies>
   <build>
diff --git a/entitybroker/core-providers/pom.xml b/entitybroker/core-providers/pom.xml
index 4705cad40882..659428811131 100644
--- a/entitybroker/core-providers/pom.xml
+++ b/entitybroker/core-providers/pom.xml
@@ -46,11 +46,11 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
          <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
+             <groupId>com.sun.mail</groupId>
+             <artifactId>javax.mail</artifactId>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
diff --git a/entitybroker/impl/pom.xml b/entitybroker/impl/pom.xml
index 5a67cc0efb11..c77a51b9d969 100644
--- a/entitybroker/impl/pom.xml
+++ b/entitybroker/impl/pom.xml
@@ -35,7 +35,7 @@
         <!-- external dependencies -->
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/entitybroker/mocks/pom.xml b/entitybroker/mocks/pom.xml
index 10969acbb491..5a94ebae7837 100644
--- a/entitybroker/mocks/pom.xml
+++ b/entitybroker/mocks/pom.xml
@@ -40,7 +40,7 @@
 <!-- external dependencies -->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
diff --git a/entitybroker/rest/pom.xml b/entitybroker/rest/pom.xml
index c2568e096275..ca62f17a557c 100644
--- a/entitybroker/rest/pom.xml
+++ b/entitybroker/rest/pom.xml
@@ -45,8 +45,10 @@
         </dependency>
         <!-- external dependencies -->
         <dependency>
+            <!--TODO Move to javax.servlet-api version of master-->
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
diff --git a/entitybroker/tool/pom.xml b/entitybroker/tool/pom.xml
index a360ef285f61..1f5fa3454ed8 100644
--- a/entitybroker/tool/pom.xml
+++ b/entitybroker/tool/pom.xml
@@ -36,7 +36,7 @@
         <!-- external dependencies -->
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <!-- oAuth dependency -->
         <dependency>
diff --git a/entitybroker/utils/pom.xml b/entitybroker/utils/pom.xml
index fa18ef51e7fc..8c79fdaf17a0 100644
--- a/entitybroker/utils/pom.xml
+++ b/entitybroker/utils/pom.xml
@@ -67,8 +67,11 @@
             <version>3.1</version>
         </dependency>
         <dependency>
+            <!--TODO Move to javax.servlet-api version of master-->
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
     <build>
diff --git a/feedback/pom.xml b/feedback/pom.xml
index de5bb1df0c6c..2fdd8bdfa891 100644
--- a/feedback/pom.xml
+++ b/feedback/pom.xml
@@ -40,7 +40,7 @@
   	<dependencies>
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
+			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
@@ -99,7 +99,7 @@
         </dependency>
         <dependency>
             <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
+            <artifactId>javax.activation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
diff --git a/gradebook/app/business/pom.xml b/gradebook/app/business/pom.xml
index b4e73cc768f6..c09f4d2a4f25 100644
--- a/gradebook/app/business/pom.xml
+++ b/gradebook/app/business/pom.xml
@@ -17,7 +17,7 @@
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
@@ -201,7 +201,7 @@
 <!--javax.servletservlet-api${sakai.servletapi.version}-->
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
     </dependency>
 <!-- Sakai tag library -->
     <dependency>
diff --git a/gradebook/app/ui/pom.xml b/gradebook/app/ui/pom.xml
index c4e20e7d3b1b..163f1b8b12ac 100644
--- a/gradebook/app/ui/pom.xml
+++ b/gradebook/app/ui/pom.xml
@@ -17,7 +17,7 @@
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
@@ -235,7 +235,7 @@
 <!--javax.servletservlet-api${sakai.servletapi.version}-->
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
     </dependency>
 <!-- Sakai tag library -->
     <dependency>
diff --git a/gradebook/grades-rest/pom.xml b/gradebook/grades-rest/pom.xml
index 9920a631ec35..92e99ad71728 100644
--- a/gradebook/grades-rest/pom.xml
+++ b/gradebook/grades-rest/pom.xml
@@ -65,7 +65,7 @@
 
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
         <!-- utility libs -->
diff --git a/gradebookng/tool/pom.xml b/gradebookng/tool/pom.xml
index d733250d19bd..14a8c68fc459 100644
--- a/gradebookng/tool/pom.xml
+++ b/gradebookng/tool/pom.xml
@@ -36,7 +36,7 @@
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
+			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.sakaiproject.kernel</groupId>
diff --git a/help/help-component/pom.xml b/help/help-component/pom.xml
index 661ad0ebb162..a55f2892547b 100644
--- a/help/help-component/pom.xml
+++ b/help/help-component/pom.xml
@@ -26,7 +26,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
diff --git a/help/help-tool/pom.xml b/help/help-tool/pom.xml
index 57e50bd1dc57..99fc350e0795 100644
--- a/help/help-tool/pom.xml
+++ b/help/help-tool/pom.xml
@@ -23,7 +23,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
@@ -45,7 +45,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject</groupId>
diff --git a/jobscheduler/scheduler-tool/pom.xml b/jobscheduler/scheduler-tool/pom.xml
index 1f96f9a46abb..f5c7cffae201 100644
--- a/jobscheduler/scheduler-tool/pom.xml
+++ b/jobscheduler/scheduler-tool/pom.xml
@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.quartz-scheduler</groupId>
diff --git a/jsf/jsf-app/pom.xml b/jsf/jsf-app/pom.xml
index fe1d9ff7b943..587469299c8b 100644
--- a/jsf/jsf-app/pom.xml
+++ b/jsf/jsf-app/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/jsf/jsf-spreadsheet/pom.xml b/jsf/jsf-spreadsheet/pom.xml
index fad0027890d1..a8557dd96191 100644
--- a/jsf/jsf-spreadsheet/pom.xml
+++ b/jsf/jsf-spreadsheet/pom.xml
@@ -23,7 +23,7 @@
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
diff --git a/jsf/jsf-tool-sun/pom.xml b/jsf/jsf-tool-sun/pom.xml
index b60bd30db647..5ab9999418f2 100644
--- a/jsf/jsf-tool-sun/pom.xml
+++ b/jsf/jsf-tool-sun/pom.xml
@@ -29,7 +29,7 @@
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <!-- Generic JSF Dependencies Below -->
         <dependency>
@@ -46,7 +46,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
+            <artifactId>javax.servlet.jsp-api</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/jsf/jsf-tool/pom.xml b/jsf/jsf-tool/pom.xml
index e2e4dee1ea31..4350e96d9391 100644
--- a/jsf/jsf-tool/pom.xml
+++ b/jsf/jsf-tool/pom.xml
@@ -30,7 +30,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/jsf/jsf-widgets-sun/pom.xml b/jsf/jsf-widgets-sun/pom.xml
index ac2517a3b2b5..41db6c329488 100644
--- a/jsf/jsf-widgets-sun/pom.xml
+++ b/jsf/jsf-widgets-sun/pom.xml
@@ -26,7 +26,7 @@
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.faces</groupId>
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
     </dependency>
   </dependencies>
   
diff --git a/jsf/jsf-widgets/pom.xml b/jsf/jsf-widgets/pom.xml
index 491e7a987f21..f48b666abb5b 100644
--- a/jsf/jsf-widgets/pom.xml
+++ b/jsf/jsf-widgets/pom.xml
@@ -38,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.kernel</groupId>
@@ -77,7 +77,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
+            <artifactId>javax.servlet.jsp-api</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
diff --git a/jsf/myfaces-tool/pom.xml b/jsf/myfaces-tool/pom.xml
index 45eb8a641c87..1f8302fbd46b 100644
--- a/jsf/myfaces-tool/pom.xml
+++ b/jsf/myfaces-tool/pom.xml
@@ -27,7 +27,7 @@
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.faces</groupId>
@@ -43,7 +43,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
+            <artifactId>javax.servlet.jsp-api</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/jsf/myfaces-widgets/pom.xml b/jsf/myfaces-widgets/pom.xml
index 9e8ece406ea0..a69a6e9dccfd 100644
--- a/jsf/myfaces-widgets/pom.xml
+++ b/jsf/myfaces-widgets/pom.xml
@@ -27,7 +27,7 @@
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
@@ -46,7 +46,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
+            <artifactId>javax.servlet.jsp-api</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
diff --git a/jsf2/jsf2-app/pom.xml b/jsf2/jsf2-app/pom.xml
index a8587f46af50..d99b67f588ab 100644
--- a/jsf2/jsf2-app/pom.xml
+++ b/jsf2/jsf2-app/pom.xml
@@ -20,7 +20,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/jsf2/jsf2-tool-sun/pom.xml b/jsf2/jsf2-tool-sun/pom.xml
index 645c83e1c886..cef94ac60d87 100644
--- a/jsf2/jsf2-tool-sun/pom.xml
+++ b/jsf2/jsf2-tool-sun/pom.xml
@@ -24,7 +24,7 @@
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.faces</groupId>
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
+            <artifactId>javax.servlet.jsp-api</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/jsf2/jsf2-tool/pom.xml b/jsf2/jsf2-tool/pom.xml
index 1be23e591c51..35be9776223e 100644
--- a/jsf2/jsf2-tool/pom.xml
+++ b/jsf2/jsf2-tool/pom.xml
@@ -25,7 +25,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/jsf2/jsf2-widgets-sun/pom.xml b/jsf2/jsf2-widgets-sun/pom.xml
index 0865a079cfd2..222063ea2a8b 100644
--- a/jsf2/jsf2-widgets-sun/pom.xml
+++ b/jsf2/jsf2-widgets-sun/pom.xml
@@ -21,7 +21,7 @@
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
         <groupId>javax.faces</groupId>
@@ -33,7 +33,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
     </dependency>
   </dependencies>
   
diff --git a/jsf2/jsf2-widgets/pom.xml b/jsf2/jsf2-widgets/pom.xml
index 5f28c31cbf94..4da3127c4de8 100644
--- a/jsf2/jsf2-widgets/pom.xml
+++ b/jsf2/jsf2-widgets/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.kernel</groupId>
@@ -69,7 +69,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
+            <artifactId>javax.servlet.jsp-api</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
diff --git a/kernel/api/pom.xml b/kernel/api/pom.xml
index 5188549008c6..4d07d998d31e 100644
--- a/kernel/api/pom.xml
+++ b/kernel/api/pom.xml
@@ -23,7 +23,7 @@
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-fileupload</groupId>
diff --git a/kernel/component-manager/pom.xml b/kernel/component-manager/pom.xml
index dda03172d018..352c2253d3fd 100644
--- a/kernel/component-manager/pom.xml
+++ b/kernel/component-manager/pom.xml
@@ -25,7 +25,7 @@
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
diff --git a/kernel/kernel-impl/pom.xml b/kernel/kernel-impl/pom.xml
index 3fd8b2a967ed..ab32f72c6fa2 100644
--- a/kernel/kernel-impl/pom.xml
+++ b/kernel/kernel-impl/pom.xml
@@ -146,7 +146,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jvnet.opendmk</groupId>
@@ -205,7 +205,7 @@
     </dependency>
     <dependency>
       <groupId>javax.activation</groupId>
-      <artifactId>activation</artifactId>
+      <artifactId>javax.activation-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
diff --git a/kernel/kernel-util/pom.xml b/kernel/kernel-util/pom.xml
index 5af826c52eec..23d5b8354beb 100644
--- a/kernel/kernel-util/pom.xml
+++ b/kernel/kernel-util/pom.xml
@@ -31,7 +31,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>net.sf.ehcache</groupId>
@@ -92,12 +92,5 @@
       <artifactId>spring-test</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>4.0.1</version>
-      <scope>test</scope>
-    </dependency>
-
   </dependencies>
 </project>
diff --git a/lessonbuilder/api/pom.xml b/lessonbuilder/api/pom.xml
index 2aadd9a652b1..2dfdc392456d 100644
--- a/lessonbuilder/api/pom.xml
+++ b/lessonbuilder/api/pom.xml
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/lessonbuilder/tool/pom.xml b/lessonbuilder/tool/pom.xml
index 718b0b5aae06..452362da3e1d 100644
--- a/lessonbuilder/tool/pom.xml
+++ b/lessonbuilder/tool/pom.xml
@@ -104,7 +104,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>jdom</groupId>
diff --git a/login/login-api/api/pom.xml b/login/login-api/api/pom.xml
index 859b2fa0123c..1c496a0c5aa0 100644
--- a/login/login-api/api/pom.xml
+++ b/login/login-api/api/pom.xml
@@ -30,7 +30,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
   </dependencies>
   <build>
diff --git a/login/login-authn-tool/tool/pom.xml b/login/login-authn-tool/tool/pom.xml
index 81e8d116249e..93ce322aa9cd 100644
--- a/login/login-authn-tool/tool/pom.xml
+++ b/login/login-authn-tool/tool/pom.xml
@@ -23,7 +23,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
diff --git a/login/login-impl/impl/pom.xml b/login/login-impl/impl/pom.xml
index 80429a5f1d12..819b723b2820 100644
--- a/login/login-impl/impl/pom.xml
+++ b/login/login-impl/impl/pom.xml
@@ -38,7 +38,7 @@
      </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.velocity</groupId>
diff --git a/login/login-render-engine-impl/impl/pom.xml b/login/login-render-engine-impl/impl/pom.xml
index d3a155abf1b1..6dfed3563614 100644
--- a/login/login-render-engine-impl/impl/pom.xml
+++ b/login/login-render-engine-impl/impl/pom.xml
@@ -35,7 +35,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.velocity</groupId>
diff --git a/login/login-tool/tool/pom.xml b/login/login-tool/tool/pom.xml
index 232379e29697..b999f7758351 100644
--- a/login/login-tool/tool/pom.xml
+++ b/login/login-tool/tool/pom.xml
@@ -23,7 +23,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
diff --git a/mailarchive/mailarchive-impl/impl/pom.xml b/mailarchive/mailarchive-impl/impl/pom.xml
index 617b0bb62bb2..8de25b3287e8 100644
--- a/mailarchive/mailarchive-impl/impl/pom.xml
+++ b/mailarchive/mailarchive-impl/impl/pom.xml
@@ -62,7 +62,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
diff --git a/mailarchive/mailarchive-subetha/pom.xml b/mailarchive/mailarchive-subetha/pom.xml
index e66234f0cf6c..d9678d2e45e9 100644
--- a/mailarchive/mailarchive-subetha/pom.xml
+++ b/mailarchive/mailarchive-subetha/pom.xml
@@ -68,7 +68,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
diff --git a/mailarchive/mailarchive-tool/tool/pom.xml b/mailarchive/mailarchive-tool/tool/pom.xml
index 62340e074553..24c94261f7be 100644
--- a/mailarchive/mailarchive-tool/tool/pom.xml
+++ b/mailarchive/mailarchive-tool/tool/pom.xml
@@ -58,7 +58,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/mailsender/impl/pom.xml b/mailsender/impl/pom.xml
index 9bcebffad874..f87d2cf36ef2 100644
--- a/mailsender/impl/pom.xml
+++ b/mailsender/impl/pom.xml
@@ -99,8 +99,7 @@
         </dependency>
         <dependency>
         	<groupId>javax.servlet</groupId>
-        	<artifactId>servlet-api</artifactId>
-        	<version>2.4</version>
+        	<artifactId>javax.servlet-api</artifactId>
         	<scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/master/pom.xml b/master/pom.xml
index f6d64af74374..94cd81d23336 100644
--- a/master/pom.xml
+++ b/master/pom.xml
@@ -45,11 +45,9 @@
     <sakai.woodstox.version>5.0.3</sakai.woodstox.version>
     <sakai.stax2.version>3.1.4</sakai.stax2.version>
     <sakai.java.jwt.version>3.1.0</sakai.java.jwt.version>
-    <sakai.jcr.version>1.0</sakai.jcr.version>
     <sakai.jstl.version>1.2</sakai.jstl.version>
     <sakai.lombok.version>1.18.0</sakai.lombok.version>
     <sakai.lucene.version>4.10.4</sakai.lucene.version>
-    <sakai.mail.version>1.6.0</sakai.mail.version>
     <sakai.org.json.version>20171018</sakai.org.json.version>
     <sakai.pluto.version>1.1.7</sakai.pluto.version>
     <sakai.quartz.version>2.2.3</sakai.quartz.version>
@@ -299,14 +297,14 @@
       <!-- common/lib -->
       <dependency>
         <groupId>javax.servlet.jsp</groupId>
-        <artifactId>jsp-api</artifactId>
-        <version>2.2</version>
+        <artifactId>javax.servlet.jsp-api</artifactId>
+        <version>2.3.1</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
-        <version>2.4</version>
+        <artifactId>javax.servlet-api</artifactId>
+        <version>4.0.1</version>
         <scope>provided</scope>
       </dependency>
       <!-- parser API inconsistancies -->
@@ -549,8 +547,8 @@
       </dependency>
       <dependency>
         <groupId>javax.activation</groupId>
-        <artifactId>activation</artifactId>
-        <version>1.1.1</version>
+        <artifactId>javax.activation-api</artifactId>
+        <version>1.2.0</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -878,7 +876,7 @@
       <dependency>
         <groupId>com.sun.mail</groupId>
         <artifactId>javax.mail</artifactId>
-        <version>${sakai.mail.version}</version>
+        <version>1.6.1</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -975,16 +973,10 @@
         <version>1.1.1</version>
         <scope>provided</scope>
       </dependency>
-      <dependency>
-        <groupId>javax.jcr</groupId>
-        <artifactId>jcr</artifactId>
-        <version>${sakai.jcr.version}</version>
-        <scope>provided</scope>
-      </dependency>
       <dependency>
         <groupId>javax.portlet</groupId>
         <artifactId>portlet-api</artifactId>
-        <version>1.0</version>
+        <version>3.0.1</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
diff --git a/message/message-tool/tool/pom.xml b/message/message-tool/tool/pom.xml
index 98b6f5d9eda1..adcac87600d0 100644
--- a/message/message-tool/tool/pom.xml
+++ b/message/message-tool/tool/pom.xml
@@ -46,7 +46,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/message/message-util/util/pom.xml b/message/message-util/util/pom.xml
index a06d8ce00d5e..df6476608097 100644
--- a/message/message-util/util/pom.xml
+++ b/message/message-util/util/pom.xml
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/msgcntr/messageforums-app/pom.xml b/msgcntr/messageforums-app/pom.xml
index d0964fb822d2..d06d7533645f 100644
--- a/msgcntr/messageforums-app/pom.xml
+++ b/msgcntr/messageforums-app/pom.xml
@@ -22,7 +22,7 @@
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
+			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.sakaiproject.kernel</groupId>
@@ -95,7 +95,7 @@
 		</dependency>
 		<dependency>
 		  <groupId>javax.servlet.jsp</groupId>
-		  <artifactId>jsp-api</artifactId>
+		  <artifactId>javax.servlet.jsp-api</artifactId>
 		</dependency>
 		<dependency>
 		  <groupId>net.sf.json-lib</groupId>
diff --git a/msgcntr/messageforums-component-impl/pom.xml b/msgcntr/messageforums-component-impl/pom.xml
index c792616f9c35..7a819c1bc4d8 100644
--- a/msgcntr/messageforums-component-impl/pom.xml
+++ b/msgcntr/messageforums-component-impl/pom.xml
@@ -84,8 +84,8 @@
       <artifactId>commons-collections</artifactId>
     </dependency>
     <dependency>
-        <groupId>com.sun.mail</groupId>
-        <artifactId>javax.mail</artifactId>
+      <groupId>com.sun.mail</groupId>
+      <artifactId>javax.mail</artifactId>
     </dependency>
     <dependency>
     	<groupId>org.sakaiproject.search</groupId>
diff --git a/mycalendar/pom.xml b/mycalendar/pom.xml
index eefca3ee2193..1bbb7e01dd88 100644
--- a/mycalendar/pom.xml
+++ b/mycalendar/pom.xml
@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.kernel</groupId>
diff --git a/myconnections/pom.xml b/myconnections/pom.xml
index 6432e0df9b94..33e3e863e7b9 100644
--- a/myconnections/pom.xml
+++ b/myconnections/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.kernel</groupId>
diff --git a/oauth/api/pom.xml b/oauth/api/pom.xml
index 0eefd48b678f..56cd029d849e 100644
--- a/oauth/api/pom.xml
+++ b/oauth/api/pom.xml
@@ -23,7 +23,7 @@
         <!-- For filter declaration -->
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.kernel</groupId>
diff --git a/oauth/impl/pom.xml b/oauth/impl/pom.xml
index cedb382d0337..52ed3cf7c0ec 100644
--- a/oauth/impl/pom.xml
+++ b/oauth/impl/pom.xml
@@ -37,7 +37,7 @@
 
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/oauth/tool/pom.xml b/oauth/tool/pom.xml
index 0f15a42c390b..4fcdcda1a890 100644
--- a/oauth/tool/pom.xml
+++ b/oauth/tool/pom.xml
@@ -35,7 +35,7 @@
 
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/pasystem/pom.xml b/pasystem/pom.xml
index bf3d8b6a2d38..3f3a77502a5f 100644
--- a/pasystem/pom.xml
+++ b/pasystem/pom.xml
@@ -26,7 +26,7 @@
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
   </dependencies>
 </project>
diff --git a/podcasts/podcasts-app/pom.xml b/podcasts/podcasts-app/pom.xml
index d91c393d0c32..449549639f28 100644
--- a/podcasts/podcasts-app/pom.xml
+++ b/podcasts/podcasts-app/pom.xml
@@ -52,11 +52,11 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
     </dependency> 
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.entitybroker</groupId>
diff --git a/podcasts/podcasts/pom.xml b/podcasts/podcasts/pom.xml
index 67ebee9c05d4..00684863b53d 100644
--- a/podcasts/podcasts/pom.xml
+++ b/podcasts/podcasts/pom.xml
@@ -22,7 +22,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
diff --git a/polls/tool/pom.xml b/polls/tool/pom.xml
index 248ed10a6128..fe902c1c9517 100644
--- a/polls/tool/pom.xml
+++ b/polls/tool/pom.xml
@@ -56,7 +56,7 @@
         </dependency>
 		<dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
 		<dependency>
 			<groupId>commons-beanutils</groupId>
diff --git a/portal/editor-tool/tool/pom.xml b/portal/editor-tool/tool/pom.xml
index 18c027d875dc..4c3b1c537415 100644
--- a/portal/editor-tool/tool/pom.xml
+++ b/portal/editor-tool/tool/pom.xml
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/portal/portal-api/api/pom.xml b/portal/portal-api/api/pom.xml
index 74a4b1f88e51..1bbf45aabb9f 100644
--- a/portal/portal-api/api/pom.xml
+++ b/portal/portal-api/api/pom.xml
@@ -33,7 +33,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
diff --git a/portal/portal-chat/tool/pom.xml b/portal/portal-chat/tool/pom.xml
index cd43030ee487..1282ccc20e56 100644
--- a/portal/portal-chat/tool/pom.xml
+++ b/portal/portal-chat/tool/pom.xml
@@ -67,7 +67,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/portal/portal-impl/impl/pom.xml b/portal/portal-impl/impl/pom.xml
index c2366cf1e58a..db1972478d2e 100644
--- a/portal/portal-impl/impl/pom.xml
+++ b/portal/portal-impl/impl/pom.xml
@@ -101,7 +101,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>jtidy</groupId>
diff --git a/portal/portal-render-api/api/pom.xml b/portal/portal-render-api/api/pom.xml
index 52a117bc4916..c350b003a38d 100644
--- a/portal/portal-render-api/api/pom.xml
+++ b/portal/portal-render-api/api/pom.xml
@@ -37,7 +37,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
   </dependencies>
   
diff --git a/portal/portal-render-engine-impl/impl/pom.xml b/portal/portal-render-engine-impl/impl/pom.xml
index c878b55a47f7..bd5952c21cf5 100644
--- a/portal/portal-render-engine-impl/impl/pom.xml
+++ b/portal/portal-render-engine-impl/impl/pom.xml
@@ -46,8 +46,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <!--TODO Move to javax.servlet-api version of master-->
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
diff --git a/portal/portal-render-engine-impl/pack/pom.xml b/portal/portal-render-engine-impl/pack/pom.xml
index 1c04142ae19f..4dca01925031 100644
--- a/portal/portal-render-engine-impl/pack/pom.xml
+++ b/portal/portal-render-engine-impl/pack/pom.xml
@@ -52,7 +52,7 @@
 
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/portal/portal-render-impl/impl/pom.xml b/portal/portal-render-impl/impl/pom.xml
index 5b9515a2b82c..58692e38b250 100644
--- a/portal/portal-render-impl/impl/pom.xml
+++ b/portal/portal-render-impl/impl/pom.xml
@@ -61,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.pluto</groupId>
diff --git a/portal/portal-service-impl/impl/pom.xml b/portal/portal-service-impl/impl/pom.xml
index fdb6a60bf92e..c72df0fe2a16 100644
--- a/portal/portal-service-impl/impl/pom.xml
+++ b/portal/portal-service-impl/impl/pom.xml
@@ -70,7 +70,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
diff --git a/portal/portal-tool/tool/pom.xml b/portal/portal-tool/tool/pom.xml
index 8d261969e551..0c728e678307 100644
--- a/portal/portal-tool/tool/pom.xml
+++ b/portal/portal-tool/tool/pom.xml
@@ -38,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/portal/portal-util/util/pom.xml b/portal/portal-util/util/pom.xml
index ee39fecdf4be..469c614b29aa 100644
--- a/portal/portal-util/util/pom.xml
+++ b/portal/portal-util/util/pom.xml
@@ -41,8 +41,10 @@
             <artifactId>sakai-portal-api</artifactId>
         </dependency>
         <dependency>
+            <!--TODO Move to javax.servlet-api version of master-->
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.0.1</version>
         </dependency>
     </dependencies>
 
diff --git a/postem/postem-app/pom.xml b/postem/postem-app/pom.xml
index fe3024bb8732..ee616f015298 100644
--- a/postem/postem-app/pom.xml
+++ b/postem/postem-app/pom.xml
@@ -85,7 +85,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
@@ -105,7 +105,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
     </dependency>
   </dependencies>
   <build>
diff --git a/presence/presence-tool/tool/pom.xml b/presence/presence-tool/tool/pom.xml
index 6e062dc6368d..0751423e9192 100644
--- a/presence/presence-tool/tool/pom.xml
+++ b/presence/presence-tool/tool/pom.xml
@@ -58,7 +58,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
     </dependencies>
     
diff --git a/profile2/impl/pom.xml b/profile2/impl/pom.xml
index bae9d7dae71c..4fc673fc6778 100644
--- a/profile2/impl/pom.xml
+++ b/profile2/impl/pom.xml
@@ -60,7 +60,7 @@
 		</dependency>
 		<dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
 		<dependency>
 			<groupId>com.opencsv</groupId>
diff --git a/profile2/tool/pom.xml b/profile2/tool/pom.xml
index 4bcba8d197db..725f119e17bc 100644
--- a/profile2/tool/pom.xml
+++ b/profile2/tool/pom.xml
@@ -43,7 +43,7 @@
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
+			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
 		<dependency>
       		<groupId>commons-io</groupId>
diff --git a/reset-pass/account-validator-tool/pom.xml b/reset-pass/account-validator-tool/pom.xml
index beccf49436de..801c5ee806cb 100644
--- a/reset-pass/account-validator-tool/pom.xml
+++ b/reset-pass/account-validator-tool/pom.xml
@@ -82,7 +82,7 @@
       </dependency>
       <dependency>
       	<groupId>javax.servlet</groupId>
-      	<artifactId>servlet-api</artifactId>
+      	<artifactId>javax.servlet-api</artifactId>
       </dependency>
 		<dependency>
 			<groupId>joda-time</groupId>
diff --git a/roster2/pom.xml b/roster2/pom.xml
index feea3a881452..b933251c6897 100644
--- a/roster2/pom.xml
+++ b/roster2/pom.xml
@@ -116,7 +116,7 @@
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
+			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/rsf/sakai-rsf-core/pom.xml b/rsf/sakai-rsf-core/pom.xml
index ed1c879d5250..58fc77f471d4 100644
--- a/rsf/sakai-rsf-core/pom.xml
+++ b/rsf/sakai-rsf-core/pom.xml
@@ -87,7 +87,7 @@
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
+			<artifactId>javax.servlet-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/rubrics/tool/pom.xml b/rubrics/tool/pom.xml
index 4b6730165a71..0751f8ec0785 100644
--- a/rubrics/tool/pom.xml
+++ b/rubrics/tool/pom.xml
@@ -29,11 +29,10 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
+            <artifactId>javax.servlet.jsp-api</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp.jstl</groupId>
diff --git a/rwiki/rwiki-access-tool/pom.xml b/rwiki/rwiki-access-tool/pom.xml
index 1ac9600f97b0..dc87ab4711ae 100644
--- a/rwiki/rwiki-access-tool/pom.xml
+++ b/rwiki/rwiki-access-tool/pom.xml
@@ -23,7 +23,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
diff --git a/rwiki/rwiki-api/api/pom.xml b/rwiki/rwiki-api/api/pom.xml
index 3fead745caf0..2bf5142fe009 100644
--- a/rwiki/rwiki-api/api/pom.xml
+++ b/rwiki/rwiki-api/api/pom.xml
@@ -49,7 +49,7 @@
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
diff --git a/rwiki/rwiki-impl/impl/pom.xml b/rwiki/rwiki-impl/impl/pom.xml
index 55e4057cdf78..0349382f94d6 100644
--- a/rwiki/rwiki-impl/impl/pom.xml
+++ b/rwiki/rwiki-impl/impl/pom.xml
@@ -63,7 +63,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
diff --git a/rwiki/rwiki-tool/tool/pom.xml b/rwiki/rwiki-tool/tool/pom.xml
index 127301ca966a..16dd0e02813d 100644
--- a/rwiki/rwiki-tool/tool/pom.xml
+++ b/rwiki/rwiki-tool/tool/pom.xml
@@ -54,7 +54,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
@@ -106,7 +106,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/samigo/samigo-api/pom.xml b/samigo/samigo-api/pom.xml
index 84967c54c2df..0075bf46c68c 100644
--- a/samigo/samigo-api/pom.xml
+++ b/samigo/samigo-api/pom.xml
@@ -29,7 +29,7 @@
       </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
+        <artifactId>javax.servlet-api</artifactId>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
diff --git a/samigo/samigo-app/pom.xml b/samigo/samigo-app/pom.xml
index 97ab960781be..884af9d6aefc 100644
--- a/samigo/samigo-app/pom.xml
+++ b/samigo/samigo-app/pom.xml
@@ -163,26 +163,26 @@
         </dependency>
 		<dependency>
             <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
+            <artifactId>javax.activation-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>javax.mail</artifactId>
         </dependency>
-	<dependency>
+	    <dependency>
             <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
-	    <scope>provided</scope>
+            <artifactId>javax.servlet.jsp-api</artifactId>
+	        <scope>provided</scope>
         </dependency>
-	<dependency>
+	    <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
             <scope>compile</scope>
         </dependency>
 		<dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>jdom</groupId>
diff --git a/samigo/samigo-cp/pom.xml b/samigo/samigo-cp/pom.xml
index 62f9f49a2244..8f6ca910b56a 100644
--- a/samigo/samigo-cp/pom.xml
+++ b/samigo/samigo-cp/pom.xml
@@ -21,7 +21,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
+			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.sakaiproject.kernel</groupId>
diff --git a/samigo/samigo-impl/pom.xml b/samigo/samigo-impl/pom.xml
index 35c00eeed00a..3cfc32a7443d 100644
--- a/samigo/samigo-impl/pom.xml
+++ b/samigo/samigo-impl/pom.xml
@@ -93,7 +93,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
diff --git a/samigo/samigo-qti/pom.xml b/samigo/samigo-qti/pom.xml
index c456b5f8895e..c2a8182e0c27 100644
--- a/samigo/samigo-qti/pom.xml
+++ b/samigo/samigo-qti/pom.xml
@@ -21,7 +21,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
+			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -82,8 +82,8 @@
 		</dependency>
 		<dependency>
 			<groupId>javax.activation</groupId>
-			<artifactId>activation</artifactId>
-			<version>1.0.2</version>
+			<artifactId>javax.activation-api</artifactId>
+			<version>1.2.0</version>
 			<!--properties:  war.bundle: standalone -->
 		</dependency>
         <dependency>
diff --git a/samigo/samigo-services/pom.xml b/samigo/samigo-services/pom.xml
index e568198fa2d5..b5ac62fbc4fd 100644
--- a/samigo/samigo-services/pom.xml
+++ b/samigo/samigo-services/pom.xml
@@ -78,11 +78,11 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
+            <artifactId>javax.activation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
diff --git a/search/elasticsearch/impl/pom.xml b/search/elasticsearch/impl/pom.xml
index 9c511d15842e..386f68876f89 100644
--- a/search/elasticsearch/impl/pom.xml
+++ b/search/elasticsearch/impl/pom.xml
@@ -90,7 +90,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/search/search-impl/impl/pom.xml b/search/search-impl/impl/pom.xml
index 010a85f885a5..96632585b6f5 100644
--- a/search/search-impl/impl/pom.xml
+++ b/search/search-impl/impl/pom.xml
@@ -106,7 +106,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
diff --git a/search/search-tool/tool/pom.xml b/search/search-tool/tool/pom.xml
index 59c2f0304c95..d681d23d364b 100644
--- a/search/search-tool/tool/pom.xml
+++ b/search/search-tool/tool/pom.xml
@@ -51,7 +51,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
diff --git a/sections/sections-app-util/pom.xml b/sections/sections-app-util/pom.xml
index 0f9d3d5afdd4..ae8a5c5b6d64 100644
--- a/sections/sections-app-util/pom.xml
+++ b/sections/sections-app-util/pom.xml
@@ -67,7 +67,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
     </dependency>
   </dependencies>
   <reports />
diff --git a/sections/sections-app/pom.xml b/sections/sections-app/pom.xml
index c752adcf0c32..8ce8ceecd4bc 100644
--- a/sections/sections-app/pom.xml
+++ b/sections/sections-app/pom.xml
@@ -27,7 +27,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
diff --git a/shortenedurl/impl/pom.xml b/shortenedurl/impl/pom.xml
index 058f94485b9c..5eec4c4987f5 100755
--- a/shortenedurl/impl/pom.xml
+++ b/shortenedurl/impl/pom.xml
@@ -48,7 +48,7 @@
         </dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
+			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
         
         <!-- kernel dependencies -->
diff --git a/shortenedurl/tool/pom.xml b/shortenedurl/tool/pom.xml
index faccb1b5c5ec..68c8b3a115ed 100755
--- a/shortenedurl/tool/pom.xml
+++ b/shortenedurl/tool/pom.xml
@@ -26,7 +26,7 @@
 		<!--  external dependencies -->
 	    <dependency>
 	      	<groupId>javax.servlet</groupId>
-	      	<artifactId>servlet-api</artifactId>
+	      	<artifactId>javax.servlet-api</artifactId>
 	    </dependency>
 	    <dependency>
       		<groupId>commons-lang</groupId>
diff --git a/signup/tool/pom.xml b/signup/tool/pom.xml
index 3f209397ab15..80c0cfa4329f 100644
--- a/signup/tool/pom.xml
+++ b/signup/tool/pom.xml
@@ -101,7 +101,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.myfaces.tomahawk</groupId>
@@ -126,9 +126,8 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
+            <artifactId>javax.servlet.jsp-api</artifactId>
         </dependency>
-        
         <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
diff --git a/simple-rss-portlet/pom.xml b/simple-rss-portlet/pom.xml
index 03e8ba05058e..23808965a2a6 100644
--- a/simple-rss-portlet/pom.xml
+++ b/simple-rss-portlet/pom.xml
@@ -100,13 +100,11 @@
 		<dependency>
       		<groupId>javax.portlet</groupId>
       		<artifactId>portlet-api</artifactId>
-      		<version>1.0</version>
       		<scope>provided</scope>
     	</dependency>
     	<dependency>
       		<groupId>javax.servlet</groupId>
-      		<artifactId>servlet-api</artifactId>
-      		<version>2.4</version>
+      		<artifactId>javax.servlet-api</artifactId>
       		<scope>provided</scope>
     	</dependency>
 		<dependency>
diff --git a/site-manage/site-manage-group-section-role-helper/tool/pom.xml b/site-manage/site-manage-group-section-role-helper/tool/pom.xml
index f8c5b6b37a4e..0282afb55dc0 100644
--- a/site-manage/site-manage-group-section-role-helper/tool/pom.xml
+++ b/site-manage/site-manage-group-section-role-helper/tool/pom.xml
@@ -68,7 +68,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>commons-fileupload</groupId>
diff --git a/site-manage/site-manage-link-helper/pom.xml b/site-manage/site-manage-link-helper/pom.xml
index 36d6797821c6..2bc181387ab9 100644
--- a/site-manage/site-manage-link-helper/pom.xml
+++ b/site-manage/site-manage-link-helper/pom.xml
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/site-manage/site-manage-tool/tool/pom.xml b/site-manage/site-manage-tool/tool/pom.xml
index 65d6a120ee6f..5b105ca8a479 100644
--- a/site-manage/site-manage-tool/tool/pom.xml
+++ b/site-manage/site-manage-tool/tool/pom.xml
@@ -95,7 +95,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
diff --git a/site/admin-perms-tool/pom.xml b/site/admin-perms-tool/pom.xml
index 499a201de235..9035d1606b4d 100644
--- a/site/admin-perms-tool/pom.xml
+++ b/site/admin-perms-tool/pom.xml
@@ -27,7 +27,7 @@
     <!-- we are running a webapp in a servlet container so we need the servlet API -->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <!-- We need this special package to run the jsps in Sakai -->
     <dependency>
@@ -86,7 +86,7 @@
     <!-- JSP and standard tag libraries -->
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/site/sakai-message-bundle-manager-tool/pom.xml b/site/sakai-message-bundle-manager-tool/pom.xml
index fb8a1960b51b..f43dc9cc6855 100644
--- a/site/sakai-message-bundle-manager-tool/pom.xml
+++ b/site/sakai-message-bundle-manager-tool/pom.xml
@@ -70,7 +70,7 @@
         <!-- we are running a webapp in a servlet container so we need the servlet API -->
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
 			<scope>provided</scope>
         </dependency>
 
diff --git a/sitedescription/pom.xml b/sitedescription/pom.xml
index d487de4d8437..440551e16080 100644
--- a/sitedescription/pom.xml
+++ b/sitedescription/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.kernel</groupId>
diff --git a/sitemembers/pom.xml b/sitemembers/pom.xml
index 4c91e66c6296..c3b403191a31 100644
--- a/sitemembers/pom.xml
+++ b/sitemembers/pom.xml
@@ -31,7 +31,7 @@
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
+			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.sakaiproject.kernel</groupId>
diff --git a/sitestats/sitestats-impl/pom.xml b/sitestats/sitestats-impl/pom.xml
index 737034433403..e908e029fb60 100644
--- a/sitestats/sitestats-impl/pom.xml
+++ b/sitestats/sitestats-impl/pom.xml
@@ -218,7 +218,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sitestats/sitestats-tool/pom.xml b/sitestats/sitestats-tool/pom.xml
index e8edecf340d4..94bf30dd42bc 100644
--- a/sitestats/sitestats-tool/pom.xml
+++ b/sitestats/sitestats-tool/pom.xml
@@ -114,11 +114,11 @@
     <!-- Servlet -->  
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
     </dependency>
     
   </dependencies>
diff --git a/syllabus/syllabus-app/pom.xml b/syllabus/syllabus-app/pom.xml
index 672ebb2c58d6..625d0d0f6f99 100644
--- a/syllabus/syllabus-app/pom.xml
+++ b/syllabus/syllabus-app/pom.xml
@@ -33,7 +33,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
@@ -87,7 +87,7 @@
 		
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.myfaces.tomahawk</groupId>
diff --git a/tags/pom.xml b/tags/pom.xml
index 0d726059b92a..e5ebd79636d7 100644
--- a/tags/pom.xml
+++ b/tags/pom.xml
@@ -25,7 +25,7 @@
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/textarea/FCKeditor/connector/pom.xml b/textarea/FCKeditor/connector/pom.xml
index 4cf4dd75804d..f390498256f2 100644
--- a/textarea/FCKeditor/connector/pom.xml
+++ b/textarea/FCKeditor/connector/pom.xml
@@ -23,7 +23,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
@@ -47,7 +47,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.entitybroker</groupId>
diff --git a/textarea/calendar/pom.xml b/textarea/calendar/pom.xml
index 633cbb535170..133c3a9b6b6b 100644
--- a/textarea/calendar/pom.xml
+++ b/textarea/calendar/pom.xml
@@ -23,7 +23,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
@@ -39,7 +39,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.entitybroker</groupId>
diff --git a/textarea/elfinder-sakai/pom.xml b/textarea/elfinder-sakai/pom.xml
index fa4f64075078..f738f4306a2a 100644
--- a/textarea/elfinder-sakai/pom.xml
+++ b/textarea/elfinder-sakai/pom.xml
@@ -46,7 +46,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/user/user-tool-prefs/tool/pom.xml b/user/user-tool-prefs/tool/pom.xml
index 47a23af5bedc..370babeabac9 100644
--- a/user/user-tool-prefs/tool/pom.xml
+++ b/user/user-tool-prefs/tool/pom.xml
@@ -91,11 +91,11 @@
     </dependency>
     <dependency>
          <groupId>javax.servlet.jsp</groupId>
-         <artifactId>jsp-api</artifactId>
+         <artifactId>javax.servlet.jsp-api</artifactId>
       </dependency>
     <dependency>
        <groupId>javax.servlet</groupId>
-       <artifactId>servlet-api</artifactId>
+       <artifactId>javax.servlet-api</artifactId>
     </dependency>
 
 	<dependency>
diff --git a/userauditservice/tool/pom.xml b/userauditservice/tool/pom.xml
index 02ecc31790ae..ff54bc9a8c79 100644
--- a/userauditservice/tool/pom.xml
+++ b/userauditservice/tool/pom.xml
@@ -53,11 +53,11 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
+            <artifactId>javax.servlet.jsp-api</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/userauditservice/util/pom.xml b/userauditservice/util/pom.xml
index dce7cc28815d..b20536a97b26 100644
--- a/userauditservice/util/pom.xml
+++ b/userauditservice/util/pom.xml
@@ -50,7 +50,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/usermembership/tool/pom.xml b/usermembership/tool/pom.xml
index 3f488871d932..cc1ab5b884ed 100644
--- a/usermembership/tool/pom.xml
+++ b/usermembership/tool/pom.xml
@@ -23,7 +23,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
diff --git a/velocity/tool/pom.xml b/velocity/tool/pom.xml
index 8c3b02190ec7..8e5d044cd60c 100644
--- a/velocity/tool/pom.xml
+++ b/velocity/tool/pom.xml
@@ -51,7 +51,7 @@
 	
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.velocity</groupId>
diff --git a/velocity/util/pom.xml b/velocity/util/pom.xml
index d74eb184c443..3f7885621f0c 100644
--- a/velocity/util/pom.xml
+++ b/velocity/util/pom.xml
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/web/web-portlet/pom.xml b/web/web-portlet/pom.xml
index 093568a8c2fb..30cccb38d7b3 100644
--- a/web/web-portlet/pom.xml
+++ b/web/web-portlet/pom.xml
@@ -49,12 +49,11 @@
          </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
     <dependency>
       <groupId>javax.portlet</groupId>
       <artifactId>portlet-api</artifactId>
-      <version>1.0</version>
     </dependency>
 <!-- velocity and dependencies (logkit, oro, collections) -->
     <dependency>
diff --git a/web/web-tool/tool/pom.xml b/web/web-tool/tool/pom.xml
index f991a01ca16a..b63358f97f40 100644
--- a/web/web-tool/tool/pom.xml
+++ b/web/web-tool/tool/pom.xml
@@ -25,7 +25,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
diff --git a/webservices/cxf/pom.xml b/webservices/cxf/pom.xml
index b134f3edd02d..400ef5d3b7ae 100644
--- a/webservices/cxf/pom.xml
+++ b/webservices/cxf/pom.xml
@@ -64,7 +64,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
         <!--  Sakai dependencies -->
@@ -192,12 +192,6 @@
             <artifactId>commons-lang3</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>