From 3bd6b31febe892f09a124815d09b2730b97f17aa Mon Sep 17 00:00:00 2001
From: Earle Nietzel <earle@longsight.com>
Date: Thu, 2 Mar 2017 10:33:29 -0500
Subject: [PATCH] SAK-31867 Centralize shared deployment to one project (#3996)

---
 dav/dav-common/pom.xml                     |   2 +-
 dav/dav-server/pom.xml                     |   2 +-
 deploy/common/pom.xml                      |  29 -
 deploy/pom.xml                             | 593 ++++++++++++++++++++-
 deploy/shared/pom.xml                      | 261 ---------
 emailtemplateservice/deploy/pom.xml        |  37 --
 emailtemplateservice/deploy/shared/pom.xml |  34 --
 emailtemplateservice/pom.xml               |   8 -
 kernel/deploy/common/pom.xml               |  99 ----
 kernel/deploy/pom.xml                      |  20 -
 kernel/deploy/shared/pom.xml               | 296 ----------
 kernel/kernel-common/pom.xml               |   2 +-
 kernel/pom.xml                             |  40 --
 master/pom.xml                             |  81 +++
 portal/pom.xml                             |   3 -
 portal/portal-shared-deploy/pom.xml        |  55 --
 userauditservice/deploy/pom.xml            |  37 --
 userauditservice/deploy/shared/pom.xml     |  34 --
 userauditservice/pom.xml                   |   7 -
 19 files changed, 651 insertions(+), 989 deletions(-)
 delete mode 100644 deploy/common/pom.xml
 delete mode 100644 deploy/shared/pom.xml
 delete mode 100644 emailtemplateservice/deploy/pom.xml
 delete mode 100644 emailtemplateservice/deploy/shared/pom.xml
 delete mode 100644 kernel/deploy/common/pom.xml
 delete mode 100644 kernel/deploy/pom.xml
 delete mode 100644 kernel/deploy/shared/pom.xml
 delete mode 100644 portal/portal-shared-deploy/pom.xml
 delete mode 100644 userauditservice/deploy/pom.xml
 delete mode 100644 userauditservice/deploy/shared/pom.xml

diff --git a/dav/dav-common/pom.xml b/dav/dav-common/pom.xml
index 0661c84a2fb3..7e9146f2b5eb 100644
--- a/dav/dav-common/pom.xml
+++ b/dav/dav-common/pom.xml
@@ -17,7 +17,7 @@
   <inceptionYear>2003</inceptionYear>
   <packaging>jar</packaging>
   <properties>
-    <deploy.target>common</deploy.target>
+    <deploy.target>shared</deploy.target>
   </properties>
   <dependencies />
   <build>
diff --git a/dav/dav-server/pom.xml b/dav/dav-server/pom.xml
index b19317bb06c0..d91d714db9ec 100644
--- a/dav/dav-server/pom.xml
+++ b/dav/dav-server/pom.xml
@@ -17,7 +17,7 @@
     <inceptionYear>2003</inceptionYear>
     <packaging>jar</packaging>
     <properties>
-        <deploy.target>common</deploy.target>
+        <deploy.target>shared</deploy.target>
     </properties>
     <dependencies>
         <dependency>
diff --git a/deploy/common/pom.xml b/deploy/common/pom.xml
deleted file mode 100644
index 42fe579d227c..000000000000
--- a/deploy/common/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.sakaiproject.deploy</groupId>
-        <artifactId>deploy</artifactId>
-        <version>12-SNAPSHOT</version>
-    </parent>
-
-    <name>Sakai Deploy: common/lib</name>
-    <groupId>org.sakaiproject.deploy</groupId>
-    <artifactId>common-deploy</artifactId>
-    <packaging>pom</packaging>
-    <description>This pom deploys misc. jars to common/lib.</description>
-
-    <organization>
-        <name>Sakai Project</name>
-        <url>http://sakaiproject.org/</url>
-    </organization>
-    <inceptionYear>2003</inceptionYear>
-
-    <properties>
-        <deploy.target>common</deploy.target>
-    </properties>
-
-    <dependencies />
-</project>
diff --git a/deploy/pom.xml b/deploy/pom.xml
index 365ac193798e..0310ec0014a9 100644
--- a/deploy/pom.xml
+++ b/deploy/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -9,29 +9,570 @@
         <version>12-SNAPSHOT</version>
         <relativePath>../master/pom.xml</relativePath>
     </parent>
-    
-  <name>Sakai Deploy: Base POM</name>
-  <groupId>org.sakaiproject.deploy</groupId>
-  <artifactId>deploy</artifactId>
-  <packaging>pom</packaging>
-  
-  <modules>
-    <module>common</module>
-    <module>shared</module>
-  </modules>
-  
-	<repositories> 
-		<repository> 
-			<id>sonatype-nexus-snapshots</id> 
-			<name>Sonatype Nexus Snapshots</name> 
-			<url> https://oss.sonatype.org/content/repositories/snapshots </url> 
-			<releases> 
-				<enabled>false</enabled> 
-			</releases> 
-			<snapshots> 
-				<enabled>true</enabled> 
-			</snapshots> 
-		</repository> 
-	</repositories>
-	
+
+    <name>Sakai Deploy</name>
+    <groupId>org.sakaiproject.deploy</groupId>
+    <artifactId>deploy</artifactId>
+    <packaging>pom</packaging>
+
+    <description>This project deploys all sakai shared jars to lib</description>
+
+    <properties>
+        <deploy.target>shared</deploy.target>
+    </properties>
+
+    <profiles>
+        <profile>
+            <!-- This profile isn't active by default, as we can't bundle the JAR due to license restrictions
+                 but if you build with the mysql profile active then the JAR will get downloaded and deployed into
+                 tomcat without you having to copy it seperately. -->
+            <id>mysql</id>
+            <dependencies>
+                <dependency>
+                    <groupId>mysql</groupId>
+                    <artifactId>mysql-connector-java</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <!-- The profile isnt' active by default, as again we can't bundle the JAR due to license restrictions
+                 but if you build with the oracle profile the JAR will get downloaded and deployed into tomcat
+                 without having to copy it. However to get this profile to work you need to have setup the oracle
+                 repository. -->
+            <id>oracle</id>
+            <repositories>
+                <repository>
+                    <id>maven.oracle.com</id>
+                    <name>oracle-maven-repo</name>
+                    <url>https://maven.oracle.com</url>
+                    <layout>default</layout>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>always</updatePolicy>
+                    </releases>
+                </repository>
+            </repositories>
+            <dependencies>
+                <dependency>
+                    <groupId>com.oracle.jdbc</groupId>
+                    <artifactId>ojdbc7</artifactId>
+                    <version>12.1.0.2</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
+    <dependencies>
+        <!-- database -->
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- connection pooling -->
+        <dependency>
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-pool</groupId>
+            <artifactId>commons-pool</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.sql</groupId>
+            <artifactId>jdbc-stdext</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- logging -->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>apache-log4j-extras</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- Required by Tomcat 7.  Can be dropped once it's confirmed that JSF-related tools are bundling it up in their webapps. -->
+        <dependency>
+            <groupId>commons-el</groupId>
+            <artifactId>commons-el</artifactId>
+            <version>1.0</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- incorporated jstl-shared-deploy pom.  Can be dropped once it's confirmed that JSF-related tools are bundling it up in their webapps. -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- quartz scheduler -->
+        <dependency>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- csv library -->
+        <dependency>
+            <groupId>net.sf.opencsv</groupId>
+            <artifactId>opencsv</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- lucene jars required by elasticsearch and help -->
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-analyzers-common</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-queries</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-queryparser</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- elasticsearch and lucene jars required by search -->
+        <dependency>
+            <groupId>org.fusesource</groupId>
+            <artifactId>sigar</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-codecs</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-grouping</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-memory</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-misc</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-highlighter</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-sandbox</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-suggest</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-spatial</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-join</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-expressions</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.vividsolutions</groupId>
+            <artifactId>jts</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.spatial4j</groupId>
+            <artifactId>spatial4j</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.elasticsearch</groupId>
+            <artifactId>elasticsearch</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- jackson libs need to be in shared with spring -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- Samigo shared dependencies -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-math3</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>OKI</groupId>
+            <artifactId>OkiOSID</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- emailtemplateservice and userauditservice -->
+        <dependency>
+            <groupId>org.simpleframework</groupId>
+            <artifactId>simple-xml</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- portal -->
+        <dependency>
+            <groupId>org.codehaus.castor</groupId>
+            <artifactId>castor</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.portlet</groupId>
+            <artifactId>portlet-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-container</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-descriptor-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-descriptor-impl</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-taglib</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- spring -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-expression</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- spring related -->
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>aopalliance</groupId>
+            <artifactId>aopalliance</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- apache -->
+        <dependency>
+            <groupId>antlr</groupId>
+            <artifactId>antlr</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr-runtime</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- hibernate -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging-annotations</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss</groupId>
+            <artifactId>jandex</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.common</groupId>
+            <artifactId>hibernate-commons-annotations</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.javax.persistence</groupId>
+            <artifactId>hibernate-jpa-2.1-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- hibernate related -->
+        <dependency>
+            <groupId>javax.transaction</groupId>
+            <artifactId>jta</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- xml -->
+        <dependency>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jdom</groupId>
+            <artifactId>jdom</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- mail -->
+        <dependency>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>javax.mail</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-jms</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- caching -->
+        <dependency>
+            <groupId>com.hazelcast</groupId>
+            <artifactId>hazelcast</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.hazelcast</groupId>
+            <artifactId>hazelcast-client</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache-core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-ehcache</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.terracotta</groupId>
+            <artifactId>terracotta-toolkit-1.6-runtime</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache-terracotta</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- other -->
+        <dependency>
+            <groupId>org.mnode.ical4j</groupId>
+            <artifactId>ical4j</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-nodep</artifactId>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
 </project>
diff --git a/deploy/shared/pom.xml b/deploy/shared/pom.xml
deleted file mode 100644
index 470e09266ba2..000000000000
--- a/deploy/shared/pom.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.sakaiproject.deploy</groupId>
-        <artifactId>deploy</artifactId>
-        <version>12-SNAPSHOT</version>
-    </parent>
-
-    <name>Sakai Deploy: shared/lib</name>
-    <groupId>org.sakaiproject.deploy</groupId>
-    <artifactId>shared-deploy</artifactId>
-    <packaging>pom</packaging>
-    <description>This pom deploys misc. jars to shared/lib.</description>
-
-    <organization>
-        <name>Sakai Project</name>
-        <url>http://sakaiproject.org/</url>
-    </organization>
-    <inceptionYear>2007</inceptionYear>
-
-    <properties>
-        <deploy.target>shared</deploy.target>
-    </properties>
-
-    <dependencies>
-        <!-- Required by Tomcat 7.  Can be dropped once it's confirmed that JSF-related tools are bundling it up in their webapps. -->
-        <dependency>
-            <groupId>commons-el</groupId>
-            <artifactId>commons-el</artifactId>
-            <version>1.0</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- incorporated jstl-shared-deploy pom.  Can be dropped once it's confirmed that JSF-related tools are bundling it up in their webapps. -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- emailtemplateservice dependency (emailtemplateservice-assembly 
-            -> shared/lib) ETS shared-deploy pom now deploys it -->
-
-        <!--
-        <dependency>
-            <groupId>org.simpleframework</groupId>
-            <artifactId>simple-xml</artifactId>
-            <version>2.3.6</version>
-            <scope>compile</scope>
-        </dependency>
-        -->
-
-        <dependency>
-            <groupId>org.quartz-scheduler</groupId>
-            <artifactId>quartz</artifactId>
-            <version>${sakai.quartz.version}</version>
-            <scope>compile</scope>
-        </dependency>
-		<dependency>
-			<groupId>net.sf.opencsv</groupId>
-			<artifactId>opencsv</artifactId>
-			<version>${sakai.opencsv.version}</version>
-			<scope>compile</scope>
-		</dependency>
-
-        <!-- The kernel assembly includes these jars (transitive dependencies
-            of hibernate-3.2.7.ga) despite the fact that the kernel does not explicitly 
-            define these jars as dependencies. -->
-        
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib-nodep</artifactId>
-            <version>3.1</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- Lucene jars required by Elasticsearch and help -->
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-core</artifactId>
-			<version>${sakai.lucene.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-analyzers-common</artifactId>
-			<version>${sakai.lucene.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-queries</artifactId>
-			<version>${sakai.lucene.version}</version>
-			<scope>compile</scope>
-		</dependency>      
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-queryparser</artifactId>
-            <version>${sakai.lucene.version}</version>
-            <scope>compile</scope>
-        </dependency>      
-        
-	        <!-- Elasticsearch and Lucene jars required by search -->
-		<dependency>
-			<groupId>org.fusesource</groupId>
-			<artifactId>sigar</artifactId>
-			<version>${sakai.sigar.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-codecs</artifactId>
-			<version>${sakai.lucene.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-grouping</artifactId>
-			<version>${sakai.lucene.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-memory</artifactId>
-			<version>${sakai.lucene.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-misc</artifactId>
-			<version>${sakai.lucene.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-highlighter</artifactId>
-			<version>${sakai.lucene.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-sandbox</artifactId>
-			<version>${sakai.lucene.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-suggest</artifactId>
-			<version>${sakai.lucene.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-spatial</artifactId>
-			<version>${sakai.lucene.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-join</artifactId>
-			<version>${sakai.lucene.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-expressions</artifactId>
-			<version>${sakai.lucene.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.vividsolutions</groupId>
-			<artifactId>jts</artifactId>
-			<version>${sakai.jts.version}</version>
-			<scope>compile</scope>
-		</dependency>
-        <dependency>
-        	<groupId>com.spatial4j</groupId>
-        	<artifactId>spatial4j</artifactId>
-            <version>${sakai.spatial4j.version}</version>
-        	<scope>compile</scope>
-        </dependency>
-        <dependency>
-        	<groupId>org.elasticsearch</groupId>
-        	<artifactId>elasticsearch</artifactId>
-        	<version>${sakai.elasticsearch.version}</version>
-        	<scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
-            <version>${sakai.asm.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-commons</artifactId>
-            <version>${sakai.asm.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.java.dev.jna</groupId>
-            <artifactId>jna</artifactId>
-            <version>${sakai.jna.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.antlr</groupId>
-            <artifactId>antlr-runtime</artifactId>
-            <version>${sakai.antlr-runtime.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
-            <version>${sakai.groovy.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>apache-log4j-extras</artifactId>
-            <version>${sakai.log4j.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <!-- jackson libs need to be in shared with spring -->
-        <dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>${sakai.jackson.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>${sakai.jackson.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>${sakai.jackson.version}</version>
-			<scope>compile</scope>
-		</dependency>
-
-        <!-- Samigo shared dependencies -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-math3</artifactId>
-            <version>${sakai.commons-math3.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>OKI</groupId>
-            <artifactId>OkiOSID</artifactId>
-            <version>${sakai.okiosid.version}</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/emailtemplateservice/deploy/pom.xml b/emailtemplateservice/deploy/pom.xml
deleted file mode 100644
index 3bdfa0b9f57d..000000000000
--- a/emailtemplateservice/deploy/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.sakaiproject.emailtemplateservice</groupId>
-        <artifactId>emailtemplateservice</artifactId>
-        <version>12-SNAPSHOT</version>
-    </parent>
-
-    <name>Sakai emailtemplateservice Deploy POM</name>
-    <groupId>org.sakaiproject.emailtemplateservice</groupId>
-    <artifactId>emailtemplateservice-deploy</artifactId>
-    <packaging>pom</packaging>
-    
-    <description>emailtemplateservice deploy POM.</description>
-    
-    <organization>
-        <name>Sakai Project</name>
-        <url>http://sakaiproject.org/</url>
-    </organization>
-    <inceptionYear>2011</inceptionYear>
-
-    <modules>
-        <module>shared</module>
-    </modules>
-    
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.simpleframework</groupId>
-                <artifactId>simple-xml</artifactId>
-                <version>${sakai.simple-xml.version}</version>
-                <scope>compile</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>
diff --git a/emailtemplateservice/deploy/shared/pom.xml b/emailtemplateservice/deploy/shared/pom.xml
deleted file mode 100644
index a06b7c001aee..000000000000
--- a/emailtemplateservice/deploy/shared/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.sakaiproject.emailtemplateservice</groupId>
-        <artifactId>emailtemplateservice-deploy</artifactId>
-        <version>12-SNAPSHOT</version>
-    </parent>
-
-    <name>Sakai emailtemplateservice Shared Deploy</name>
-    <groupId>org.sakaiproject.emailtemplateservice</groupId>
-    <artifactId>emailtemplateservice-shared</artifactId>
-    <packaging>pom</packaging>
-    
-    <description>emailtemplateservice shared deploy POM.</description>
-    
-    <organization>
-        <name>Sakai Project</name>
-        <url>http://sakaiproject.org/</url>
-    </organization>
-    <inceptionYear>2011</inceptionYear>
-    
-     <properties>
-        <deploy.target>shared</deploy.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.simpleframework</groupId>
-            <artifactId>simple-xml</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/emailtemplateservice/pom.xml b/emailtemplateservice/pom.xml
index 2dd8639a3817..310a953f8189 100644
--- a/emailtemplateservice/pom.xml
+++ b/emailtemplateservice/pom.xml
@@ -18,13 +18,11 @@
   <inceptionYear>2007</inceptionYear>
 
   <properties>
-    <sakai.simple-xml.version>2.6</sakai.simple-xml.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
   <modules>
     <module>api</module>
-    <module>deploy</module>
     <module>impl/logic</module>
     <module>tool</module>
   </modules>
@@ -51,12 +49,6 @@
         <artifactId>emailtemplateservice-impl</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.simpleframework</groupId>
-        <artifactId>simple-xml</artifactId>
-        <version>${sakai.simple-xml.version}</version>
-        <scope>provided</scope>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/kernel/deploy/common/pom.xml b/kernel/deploy/common/pom.xml
deleted file mode 100644
index 5ecd6e5475bf..000000000000
--- a/kernel/deploy/common/pom.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>kernel</artifactId>
-    <groupId>org.sakaiproject</groupId>
-    <version>12-SNAPSHOT</version><!-- KernelVersion -->
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-  <description>Kernel Direct Common Deployer</description>
-  <name>Kernel Direct Common Deployer</name>
-  <groupId>org.sakaiproject.kernel.deploy</groupId>
-  <artifactId>common</artifactId>
-  <organization>
-    <name>Sakai Foundation</name>
-    <url>http://sakaiproject.org/</url>
-  </organization>
-  <inceptionYear>2003</inceptionYear>
-
-  <packaging>pom</packaging>
-  <properties>
-    <deploy.target>common</deploy.target>
-    <kernel.basedir>${basedir}/../..</kernel.basedir>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.sakaiproject.kernel</groupId>
-      <artifactId>sakai-kernel-common</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <!-- needed by kernel -->
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-        <scope>compile</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mariadb.jdbc</groupId>
-      <artifactId>mariadb-java-client</artifactId>
-    </dependency>
-  </dependencies>
-
-  <profiles>
-    <profile>
-      <!-- This profile isn't active by default, as we can't bundle the JAR due to license restrictions
-           but if you build with the mysql profile active then the JAR will get downloaded and deployed into
-           tomcat without you having to copy it seperately. -->
-      <id>mysql</id>
-      <dependencies>
-        <dependency>
-          <groupId>mysql</groupId>
-          <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
-    <profile>
-      <!-- The profile isnt' active by default, as again we can't bundle the JAR due to license restrictions
-           but if you build with the oracle profile the JAR will get downloaded and deployed into tomcat
-           without having to copy it. However to get this profile to work you need to have setup the oracle
-           repository. -->
-      <id>oracle</id>
-      <repositories>
-        <repository>
-          <id>maven.oracle.com</id>
-          <name>oracle-maven-repo</name>
-          <url>https://maven.oracle.com</url>
-          <layout>default</layout>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>always</updatePolicy>
-          </releases>
-        </repository>
-      </repositories>
-      <dependencies>
-        <dependency>
-          <groupId>com.oracle.jdbc</groupId>
-          <artifactId>ojdbc7</artifactId>
-          <version>12.1.0.2</version>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-</project>
diff --git a/kernel/deploy/pom.xml b/kernel/deploy/pom.xml
deleted file mode 100644
index b8018454daed..000000000000
--- a/kernel/deploy/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>kernel</artifactId>
-    <groupId>org.sakaiproject</groupId>
-    <version>12-SNAPSHOT</version><!-- KernelVersion -->
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <name>Sakai Deployment Project</name>
-  <groupId>org.sakaiproject.kernel</groupId>
-  <artifactId>deploy</artifactId>
-
-
-  <packaging>pom</packaging>
-  <modules>
-    <module>common</module>
-    <module>shared</module>
-  </modules>
-</project>
diff --git a/kernel/deploy/shared/pom.xml b/kernel/deploy/shared/pom.xml
deleted file mode 100644
index 121052b14f07..000000000000
--- a/kernel/deploy/shared/pom.xml
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>kernel</artifactId>
-        <groupId>org.sakaiproject</groupId>
-        <version>12-SNAPSHOT</version><!-- KernelVersion -->
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <description>Kernel Direct Shared Deployer</description>
-    <name>Kernel Direct Shared Deployer</name>
-    <groupId>org.sakaiproject.kernel.deploy</groupId>
-    <artifactId>shared</artifactId>
-    <organization>
-        <name>Sakai Foundation</name>
-        <url>http://sakaiproject.org/</url>
-    </organization>
-    <inceptionYear>2003</inceptionYear>
-    <packaging>pom</packaging>
-
-    <properties>
-        <deploy.target>shared</deploy.target>
-        <kernel.basedir>${basedir}/../..</kernel.basedir>
-    </properties>
-
-    <dependencies>
-      <dependency>
-	<groupId>org.sakaiproject.kernel</groupId>
-	<artifactId>sakai-kernel-api</artifactId>
-	<version>${project.version}</version>
-	<scope>compile</scope>
-      </dependency>      
-      <dependency>
-	<groupId>org.sakaiproject.kernel</groupId>
-	<artifactId>sakai-component-manager</artifactId>
-	<version>${project.version}</version>
-	<scope>compile</scope>
-      </dependency>
-      <dependency>
-	<groupId>org.sakaiproject.kernel</groupId>
-	<artifactId>sakai-kernel-private</artifactId>
-	<version>${project.version}</version>
-	<scope>compile</scope>
-      </dependency>
-        <!-- needed by kernel -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-expression</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-orm</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>aopalliance</groupId>
-            <artifactId>aopalliance</artifactId>
-            <version>1.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-		    <groupId>commons-codec</groupId>
-		    <artifactId>commons-codec</artifactId>
-		    <scope>compile</scope>
-		</dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-dbcp</groupId>
-            <artifactId>commons-dbcp</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-pool</groupId>
-            <artifactId>commons-pool</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>antlr</groupId>
-            <artifactId>antlr</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <scope>compile</scope>
-        </dependency>
-	    <!-- start hibernate dependencies -->
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging</artifactId>
-            <version>3.1.3.GA</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-annotations</artifactId>
-            <version>1.2.0.Beta1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss</groupId>
-            <artifactId>jandex</artifactId>
-            <version>1.1.0.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate.common</groupId>
-            <artifactId>hibernate-commons-annotations</artifactId>
-            <version>4.0.5.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.1-api</artifactId>
-            <version>1.0.0.Final</version>
-        </dependency>
-	    <!-- end hibernate dependencies -->
-        <dependency>
-            <groupId>javax.sql</groupId>
-            <artifactId>jdbc-stdext</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.transaction</groupId>
-            <artifactId>jta</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jms</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>jdom</groupId>
-            <artifactId>jdom</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>jaxen</groupId>
-            <artifactId>jaxen</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <!-- distributed caching -->
-        <dependency>
-          <groupId>com.hazelcast</groupId>
-          <artifactId>hazelcast</artifactId>
-          <scope>compile</scope>
-        </dependency>
-        <dependency>
-          <groupId>com.hazelcast</groupId>
-          <artifactId>hazelcast-client</artifactId>
-          <scope>compile</scope>
-        </dependency>
-        <!-- ehcache + distributed ehcache -->
-        <dependency>
-            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache-core</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-ehcache</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.terracotta</groupId>
-            <artifactId>terracotta-toolkit-1.6-runtime</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache-terracotta</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <!-- Java 8 Maven Artifact -->
-        <dependency>
-          <groupId>com.zaxxer</groupId>
-          <artifactId>HikariCP</artifactId>
-          <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mnode.ical4j</groupId>
-            <artifactId>ical4j</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>backport-util-concurrent</groupId>
-            <artifactId>backport-util-concurrent</artifactId>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-
-</project>
diff --git a/kernel/kernel-common/pom.xml b/kernel/kernel-common/pom.xml
index 2fcb6f7cbb9b..3a1e7c32a1aa 100644
--- a/kernel/kernel-common/pom.xml
+++ b/kernel/kernel-common/pom.xml
@@ -18,6 +18,6 @@
 
   <packaging>jar</packaging>
   <properties>
-    <deploy.target>common</deploy.target>
+    <deploy.target>shared</deploy.target>
   </properties>
 </project>
diff --git a/kernel/pom.xml b/kernel/pom.xml
index 1cee72f70eaa..6af33fa2bef3 100644
--- a/kernel/pom.xml
+++ b/kernel/pom.xml
@@ -31,7 +31,6 @@
     <module>kernel-impl</module>
     <module>kernel-util</module>
     <module>kernel-storage-util</module>
-    <module>deploy</module>
   </modules>
 
   <profiles>
@@ -48,45 +47,6 @@
     </profile>
   </profiles>
 
-  <dependencyManagement>
-    <dependencies>
-      <!-- centralize the versions for hazelcast -->
-      <dependency>
-        <groupId>com.hazelcast</groupId>
-        <artifactId>hazelcast</artifactId>
-        <version>3.2.3</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.hazelcast</groupId>
-        <artifactId>hazelcast-client</artifactId>
-        <version>3.2.3</version>
-        <scope>provided</scope>
-      </dependency>
-      <!-- centralize the versions for distributed ehcache -->
-      <dependency>
-        <groupId>org.terracotta</groupId>
-        <artifactId>terracotta-toolkit-1.6-runtime</artifactId>
-        <version>5.9.0</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>net.sf.ehcache</groupId>
-        <artifactId>ehcache-terracotta</artifactId>
-        <version>${sakai.ehcache.version}</version>
-        <scope>provided</scope>
-      </dependency>
-      <!-- Java 8 Maven Artifact -->
-      <dependency>
-        <groupId>com.zaxxer</groupId>
-        <artifactId>HikariCP</artifactId>
-        <version>2.5.1</version>
-        <scope>compile</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-
   <issueManagement>
     <system>jira</system>
     <url>http://jira.sakaiproject.org/browse/KNL</url>
diff --git a/master/pom.xml b/master/pom.xml
index fe5d9021658c..cc29b0191d41 100644
--- a/master/pom.xml
+++ b/master/pom.xml
@@ -102,6 +102,7 @@
     <sakai.jna.version>4.1.0</sakai.jna.version>
     <sakai.antlr-runtime.version>3.5</sakai.antlr-runtime.version>
     <sakai.asm.version>4.1</sakai.asm.version>
+    <sakai.simple-xml.version>2.6</sakai.simple-xml.version>
     <sakai.spring.groupId>org.springframework</sakai.spring.groupId>
     <sakai.spring.artifactId>spring-core</sakai.spring.artifactId>
     <sakai.spring.version>4.2.7.RELEASE</sakai.spring.version>
@@ -481,6 +482,12 @@
 		<version>${sakai.jackson.version}</version>
 		<scope>provided</scope>
 	  </dependency>
+      <dependency>
+        <groupId>aopalliance</groupId>
+        <artifactId>aopalliance</artifactId>
+        <version>1.0</version>
+        <scope>provided</scope>
+      </dependency>
       <dependency>
         <groupId>javax.activation</groupId>
         <artifactId>activation</artifactId>
@@ -689,6 +696,36 @@
         <version>${sakai.hibernate.version}</version>
         <scope>provided</scope>
       </dependency>
+      <dependency>
+        <groupId>org.jboss.logging</groupId>
+        <artifactId>jboss-logging</artifactId>
+        <version>3.1.3.GA</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.logging</groupId>
+        <artifactId>jboss-logging-annotations</artifactId>
+        <version>1.2.0.Beta1</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss</groupId>
+        <artifactId>jandex</artifactId>
+        <version>1.1.0.Final</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.hibernate.common</groupId>
+        <artifactId>hibernate-commons-annotations</artifactId>
+        <version>4.0.5.Final</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.hibernate.javax.persistence</groupId>
+        <artifactId>hibernate-jpa-2.1-api</artifactId>
+        <version>1.0.0.Final</version>
+        <scope>provided</scope>
+      </dependency>
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-ehcache</artifactId>
@@ -912,6 +949,12 @@
         <scope>provided</scope>
       </dependency>
       <!-- Elasticsearch -->
+      <dependency>
+        <groupId>org.elasticsearch</groupId>
+        <artifactId>elasticsearch</artifactId>
+        <version>${sakai.elasticsearch.version}</version>
+        <scope>provided</scope>
+      </dependency>
       <dependency>
       	<groupId>org.fusesource</groupId>
       	<artifactId>sigar</artifactId>
@@ -1660,11 +1703,49 @@
           <groupId>mysql</groupId>
           <artifactId>mysql-connector-java</artifactId>
           <version>5.1.40</version>
+          <scope>provided</scope>
       </dependency>
       <dependency>
           <groupId>org.mariadb.jdbc</groupId>
           <artifactId>mariadb-java-client</artifactId>
           <version>1.5.8</version>
+          <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.zaxxer</groupId>
+        <artifactId>HikariCP</artifactId>
+        <version>2.5.1</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.simpleframework</groupId>
+        <artifactId>simple-xml</artifactId>
+        <version>${sakai.simple-xml.version}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.hazelcast</groupId>
+        <artifactId>hazelcast</artifactId>
+        <version>3.2.3</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.hazelcast</groupId>
+        <artifactId>hazelcast-client</artifactId>
+        <version>3.2.3</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.terracotta</groupId>
+        <artifactId>terracotta-toolkit-1.6-runtime</artifactId>
+        <version>5.9.0</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>net.sf.ehcache</groupId>
+        <artifactId>ehcache-terracotta</artifactId>
+        <version>${sakai.ehcache.version}</version>
+        <scope>provided</scope>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/portal/pom.xml b/portal/pom.xml
index 976f0924b551..0c516b8b308d 100644
--- a/portal/pom.xml
+++ b/portal/pom.xml
@@ -20,13 +20,10 @@
         <module>portal-charon/charon</module>
         <module>portal-chat/tool</module>
         <module>portal-impl/impl</module>
-        <!-- Mercury portal retired as of 2.8, see http://jira.sakaiproject.org/browse/SAK-19001 -->
-        <!-- <module>portal-mercury/mercury</module> --> 
         <module>portal-render-api/api</module>
         <module>portal-render-impl/impl</module>
         <module>portal-render-engine-impl/impl</module>
         <module>portal-service-impl/impl</module>
-        <module>portal-shared-deploy</module>
         <module>portal-tool/tool</module>
         <module>portal-util/util</module>
     </modules>
diff --git a/portal/portal-shared-deploy/pom.xml b/portal/portal-shared-deploy/pom.xml
deleted file mode 100644
index 8721dd15cc8d..000000000000
--- a/portal/portal-shared-deploy/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <artifactId>portal</artifactId>
-        <groupId>org.sakaiproject.portal</groupId>
-        <version>12-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <name>sakai-portal-shared-deploy</name>
-    <groupId>org.sakaiproject.portal</groupId>
-    <artifactId>sakai-portal-shared-deploy</artifactId>
-    <packaging>pom</packaging>
-
-    <properties>
-        <deploy.target>shared</deploy.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.codehaus.castor</groupId>
-            <artifactId>castor</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.portlet</groupId>
-            <artifactId>portlet-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto-container</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto-descriptor-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto-descriptor-impl</artifactId>
-            <version>${sakai.pluto.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto-taglib</artifactId>
-            <version>${sakai.pluto.version}</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/userauditservice/deploy/pom.xml b/userauditservice/deploy/pom.xml
deleted file mode 100644
index e40a7b4e0884..000000000000
--- a/userauditservice/deploy/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.sakaiproject.userauditservice</groupId>
-        <artifactId>userauditservice</artifactId>
-        <version>12-SNAPSHOT</version>
-    </parent>
-
-    <name>Sakai Userauditservice Deploy POM</name>
-    <groupId>org.sakaiproject.userauditservice</groupId>
-    <artifactId>userauditservice-deploy</artifactId>
-    <packaging>pom</packaging>
-    
-    <description>Userauditservice deploy POM.</description>
-    
-    <organization>
-        <name>Sakai Project</name>
-        <url>http://sakaiproject.org/</url>
-    </organization>
-    <inceptionYear>2013</inceptionYear>
-
-    <modules>
-        <module>shared</module>
-    </modules>
-    
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.simpleframework</groupId>
-                <artifactId>simple-xml</artifactId>
-                <version>${sakai.simple-xml.version}</version>
-                <scope>compile</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>
diff --git a/userauditservice/deploy/shared/pom.xml b/userauditservice/deploy/shared/pom.xml
deleted file mode 100644
index aeede2fa928c..000000000000
--- a/userauditservice/deploy/shared/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.sakaiproject.userauditservice</groupId>
-        <artifactId>userauditservice-deploy</artifactId>
-        <version>12-SNAPSHOT</version>
-    </parent>
-
-    <name>Sakai userauditservice Shared Deploy</name>
-    <groupId>org.sakaiproject.userauditservice</groupId>
-    <artifactId>userauditservice-shared</artifactId>
-    <packaging>pom</packaging>
-    
-    <description>userauditservice shared deploy POM.</description>
-    
-    <organization>
-        <name>Sakai Project</name>
-        <url>http://sakaiproject.org/</url>
-    </organization>
-    <inceptionYear>2013</inceptionYear>
-    
-     <properties>
-        <deploy.target>shared</deploy.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.simpleframework</groupId>
-            <artifactId>simple-xml</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/userauditservice/pom.xml b/userauditservice/pom.xml
index d563cb2de600..957cee352770 100644
--- a/userauditservice/pom.xml
+++ b/userauditservice/pom.xml
@@ -24,7 +24,6 @@
 
   <modules>
     <module>api</module>
-    <module>deploy</module>
     <module>impl</module>
     <module>tool</module>
     <module>util</module>
@@ -52,12 +51,6 @@
         <artifactId>userauditservice-impl</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.simpleframework</groupId>
-        <artifactId>simple-xml</artifactId>
-        <version>${sakai.simple-xml.version}</version>
-        <scope>provided</scope>
-      </dependency>
     </dependencies>
   </dependencyManagement>