diff --git a/basiclti/basiclti-impl/pom.xml b/basiclti/basiclti-impl/pom.xml
index 2275c774bc05..55c91e99e536 100644
--- a/basiclti/basiclti-impl/pom.xml
+++ b/basiclti/basiclti-impl/pom.xml
@@ -67,6 +67,10 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
diff --git a/basiclti/tsugi-util/src/test/org/tsugi/oauth2/OAUTH2ObjectTest.java b/basiclti/tsugi-util/src/test/org/tsugi/oauth2/OAUTH2ObjectTest.java
index b69a87e3c2c1..5f40c09ee8ee 100644
--- a/basiclti/tsugi-util/src/test/org/tsugi/oauth2/OAUTH2ObjectTest.java
+++ b/basiclti/tsugi-util/src/test/org/tsugi/oauth2/OAUTH2ObjectTest.java
@@ -1,4 +1,4 @@
-package org.tsugi.lti13;
+package org.tsugi.oauth2;
 
 import static org.junit.Assert.*;
 
diff --git a/cloud-storage/googledrive/impl/pom.xml b/cloud-storage/googledrive/impl/pom.xml
index cd18e20c9a52..df98b98d4c69 100644
--- a/cloud-storage/googledrive/impl/pom.xml
+++ b/cloud-storage/googledrive/impl/pom.xml
@@ -42,12 +42,10 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>${sakai.jackson.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${sakai.jackson.version}</version>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
         </dependency>
         <!--Spring Dependencies-->
         <dependency>
diff --git a/cloud-storage/onedrive/impl/pom.xml b/cloud-storage/onedrive/impl/pom.xml
index 230b1546b7e0..9bb4d9ace1e5 100644
--- a/cloud-storage/onedrive/impl/pom.xml
+++ b/cloud-storage/onedrive/impl/pom.xml
@@ -42,12 +42,10 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>${sakai.jackson.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${sakai.jackson.version}</version>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
         </dependency>
         <!--Spring Dependencies-->
         <dependency>
diff --git a/gradebookng/tool/pom.xml b/gradebookng/tool/pom.xml
index b6870d4a5261..98e6f1523b08 100644
--- a/gradebookng/tool/pom.xml
+++ b/gradebookng/tool/pom.xml
@@ -38,6 +38,10 @@
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>javax</groupId>
+			<artifactId>javaee-api</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.sakaiproject.kernel</groupId>
 			<artifactId>sakai-kernel-api</artifactId>
diff --git a/help/help-tool/pom.xml b/help/help-tool/pom.xml
index d84f3fc56511..c18f2c41f00b 100644
--- a/help/help-tool/pom.xml
+++ b/help/help-tool/pom.xml
@@ -37,6 +37,10 @@
       <groupId>javax.servlet</groupId>
       <artifactId>jstl</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax</groupId>
+      <artifactId>javaee-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
       <artifactId>javax.servlet.jsp-api</artifactId>
diff --git a/jobscheduler/scheduler-component-shared/pom.xml b/jobscheduler/scheduler-component-shared/pom.xml
index 1b311ef26359..bc5d7de7186f 100644
--- a/jobscheduler/scheduler-component-shared/pom.xml
+++ b/jobscheduler/scheduler-component-shared/pom.xml
@@ -129,6 +129,10 @@
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/jsf2/jsf2-widgets-sun/pom.xml b/jsf2/jsf2-widgets-sun/pom.xml
index d426db8a9d0f..323fb900f7da 100644
--- a/jsf2/jsf2-widgets-sun/pom.xml
+++ b/jsf2/jsf2-widgets-sun/pom.xml
@@ -23,6 +23,10 @@
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax</groupId>
+      <artifactId>javaee-api</artifactId>
+    </dependency>
     <dependency>
         <groupId>javax.faces</groupId>
         <artifactId>javax.faces-api</artifactId>
diff --git a/jsf2/jsf2-widgets/pom.xml b/jsf2/jsf2-widgets/pom.xml
index ff43c6b61467..4b918f40d1d5 100644
--- a/jsf2/jsf2-widgets/pom.xml
+++ b/jsf2/jsf2-widgets/pom.xml
@@ -34,6 +34,10 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.sakaiproject.kernel</groupId>
             <artifactId>sakai-kernel-api</artifactId>
diff --git a/master/pom.xml b/master/pom.xml
index 36889968fd5a..4c8be72171ac 100644
--- a/master/pom.xml
+++ b/master/pom.xml
@@ -360,6 +360,12 @@
         <version>4.0.1</version>
         <scope>provided</scope>
       </dependency>
+      <dependency>
+        <groupId>javax</groupId>
+        <artifactId>javaee-api</artifactId>
+        <version>8.0</version>
+        <scope>provided</scope>
+      </dependency>
       <!-- parser API inconsistancies -->
       <!-- force this version where used -->
       <dependency>
diff --git a/msgcntr/messageforums-app/pom.xml b/msgcntr/messageforums-app/pom.xml
index 8d4c58cb6563..7f3adb577738 100644
--- a/msgcntr/messageforums-app/pom.xml
+++ b/msgcntr/messageforums-app/pom.xml
@@ -19,6 +19,10 @@
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>javax</groupId>
+			<artifactId>javaee-api</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.sakaiproject.kernel</groupId>
 			<artifactId>sakai-kernel-api</artifactId>
diff --git a/polls/impl/pom.xml b/polls/impl/pom.xml
index cd9847a2db09..d324bfddd363 100644
--- a/polls/impl/pom.xml
+++ b/polls/impl/pom.xml
@@ -85,6 +85,10 @@
             <groupId>javax.transaction</groupId>
             <artifactId>jta</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
diff --git a/portal/portal-chat/tool/pom.xml b/portal/portal-chat/tool/pom.xml
index ef7ef38136ea..cf7123b339ea 100644
--- a/portal/portal-chat/tool/pom.xml
+++ b/portal/portal-chat/tool/pom.xml
@@ -64,6 +64,10 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
diff --git a/portal/portal-util/util/pom.xml b/portal/portal-util/util/pom.xml
index 582bbdb17006..97ef83c23f74 100644
--- a/portal/portal-util/util/pom.xml
+++ b/portal/portal-util/util/pom.xml
@@ -41,6 +41,10 @@
             <artifactId>javax.servlet-api</artifactId>
             <version>3.0.1</version>
         </dependency>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/reset-pass/reset-pass/pom.xml b/reset-pass/reset-pass/pom.xml
index 77e5747c5128..43b5d61dc511 100644
--- a/reset-pass/reset-pass/pom.xml
+++ b/reset-pass/reset-pass/pom.xml
@@ -71,5 +71,9 @@
        <groupId>org.apache.commons</groupId>
        <artifactId>commons-collections4</artifactId>
     </dependency>
+    <dependency>
+        <groupId>javax</groupId>
+        <artifactId>javaee-api</artifactId>
+    </dependency>
   </dependencies>
 </project>
diff --git a/rwiki/rwiki-impl/rwiki-shared-serializer/src/java/uk/ac/cam/caret/sakai/rwiki/component/service/impl/XHTMLSerializer2.java b/rwiki/rwiki-impl/rwiki-shared-serializer/src/java/uk/ac/cam/caret/sakai/rwiki/component/service/impl/XHTMLSerializer2.java
index 78a932a938cd..88154749fe78 100644
--- a/rwiki/rwiki-impl/rwiki-shared-serializer/src/java/uk/ac/cam/caret/sakai/rwiki/component/service/impl/XHTMLSerializer2.java
+++ b/rwiki/rwiki-impl/rwiki-shared-serializer/src/java/uk/ac/cam/caret/sakai/rwiki/component/service/impl/XHTMLSerializer2.java
@@ -467,4 +467,20 @@ public void setWriter(Writer arg0) {
 		xmlStream.setWriter(arg0);
 	}
 
-}
\ No newline at end of file
+	public String getOutputProperty(String name) {
+		return xmlStream.getOutputProperty(name);
+	}
+
+	public String getOutputPropertyDefault(String name) {
+		return xmlStream.getOutputPropertyDefault(name);
+	}
+
+	public void setOutputProperty(String name, String val) {
+		xmlStream.setOutputProperty(name, val);
+	}
+
+	public void setOutputPropertyDefault(String name, String val) {
+		xmlStream.setOutputPropertyDefault(name, val);
+	}
+
+}
diff --git a/search/elasticsearch/api/pom.xml b/search/elasticsearch/api/pom.xml
index 175a76e2d3ff..e6ad59e68e43 100644
--- a/search/elasticsearch/api/pom.xml
+++ b/search/elasticsearch/api/pom.xml
@@ -19,6 +19,10 @@
       <groupId>org.elasticsearch</groupId>
       <artifactId>elasticsearch</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.sakaiproject.kernel</groupId>
+      <artifactId>sakai-kernel-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.sakaiproject.search</groupId>
       <artifactId>search-api</artifactId>
diff --git a/site-manage/site-manage-impl/impl/pom.xml b/site-manage/site-manage-impl/impl/pom.xml
index 0d8f132d6c8b..57e93736a1fa 100644
--- a/site-manage/site-manage-impl/impl/pom.xml
+++ b/site-manage/site-manage-impl/impl/pom.xml
@@ -89,6 +89,10 @@
             <groupId>jdom</groupId>
             <version>1.0</version>
         </dependency>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.sakaiproject.userauditservice</groupId>
             <artifactId>userauditservice-api</artifactId>
diff --git a/syllabus/syllabus-app/pom.xml b/syllabus/syllabus-app/pom.xml
index 36d04b2622e4..8e8d708f483b 100644
--- a/syllabus/syllabus-app/pom.xml
+++ b/syllabus/syllabus-app/pom.xml
@@ -30,6 +30,10 @@
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
     </dependency>
+    <dependency>
+        <groupId>javax</groupId>
+        <artifactId>javaee-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
       <artifactId>sakai-kernel-api</artifactId>
diff --git a/tags/tags-impl/impl/pom.xml b/tags/tags-impl/impl/pom.xml
index 2e45a9042927..c5d88db57899 100644
--- a/tags/tags-impl/impl/pom.xml
+++ b/tags/tags-impl/impl/pom.xml
@@ -86,6 +86,10 @@
       <artifactId>tags-api</artifactId>
       <version>${sakai.version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax</groupId>
+      <artifactId>javaee-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
diff --git a/tags/tags-impl/impl/src/java/org/sakaiproject/tags/impl/job/TagSynchronizer.java b/tags/tags-impl/impl/src/java/org/sakaiproject/tags/impl/job/TagSynchronizer.java
index db15bb176133..bfec986dce6f 100644
--- a/tags/tags-impl/impl/src/java/org/sakaiproject/tags/impl/job/TagSynchronizer.java
+++ b/tags/tags-impl/impl/src/java/org/sakaiproject/tags/impl/job/TagSynchronizer.java
@@ -22,7 +22,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;;
+import org.apache.commons.logging.LogFactory;
 import org.sakaiproject.component.cover.ComponentManager;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;