feature: Put dep.feature into client feature for ote

Change-Id: I615ab02699dad7ad545b6f38e7134730f766f6c0
Signed-off-by: broberts <baily.e.roberts@boeing.com>

3 files changed, 228 insertions, 15 deletions

diff --git a/features/org.eclipse.osee.client.all.feature/feature.xml b/features/org.eclipse.osee.client.all.feature/feature.xml
index 1a4c3dcc4d1..58fff8ecd51 100644
--- a/features/org.eclipse.osee.client.all.feature/feature.xml
+++ b/features/org.eclipse.osee.client.all.feature/feature.xml
@@ -20,7 +20,11 @@
    <includes
          id="org.eclipse.osee.client.feature"
          version="0.0.0"/>
-
+   
+   <includes
+         id="org.eclipse.osee.dep.feature"
+         version="0.0.0"/>
+         
    <includes
          id="org.eclipse.osee.core.runtime.feature"
          version="0.0.0"/>
diff --git a/features/org.eclipse.osee.dep.feature/feature.xml b/features/org.eclipse.osee.dep.feature/feature.xml
index b4eb4ac08ea..95512d867e2 100644
--- a/features/org.eclipse.osee.dep.feature/feature.xml
+++ b/features/org.eclipse.osee.dep.feature/feature.xml
@@ -19,19 +19,62 @@
  
     <includes
          id="org.eclipse.egit.mylyn"
-         version="5.0.0"/>   
+         version="5.0.0"/>  
   
    <includes
+         id="org.eclipse.wst.server_userdoc.feature"
+         version="0.0.0"/>      
+    
+    <includes
+         id="org.eclipse.wst.xml.xpath2.processor.feature"
+         version="0.0.0"/>         
+          
+   <includes
+         id="org.eclipse.wst.common_core.feature"
+         version="0.0.0"/> 
+   
+   <includes
+         id="org.eclipse.wst.common_ui.feature"
+         version="0.0.0"/>  
+           
+   <includes
+         id="org.eclipse.wst.server_core.feature"
+         version="0.0.0"/> 
+   
+   <includes
+         id="org.eclipse.wst.server_adapters.feature"
+         version="0.0.0"/> 
+      
+    <includes
+         id="org.eclipse.wst.server_ui.feature"
+         version="0.0.0"/>         
+    <includes
+         id="org.eclipse.wst.ws_core.feature"
+         version="0.0.0"/>         
+      
+    <includes
          id="org.eclipse.graphiti.feature"
          version="0.0.0"/>
 
-   <includes
+    <includes
          id="org.eclipse.graphiti.feature.source"
          version="0.0.0"/>
- 
-   <includes
+
+    <includes
          id="org.eclipse.jgit.lfs"
          version="5.0.0"/>
+         
+    <includes
+         id="org.eclipse.m2e.feature"
+        version="0.0.0"/>
+     
+     <includes
+         id="org.eclipse.m2e.logback.feature"
+        version="0.0.0"/>
+    
+    <includes
+         id="org.eclipse.m2e.sdk.feature"
+        version="0.0.0"/> 
    
    <includes
          id="org.eclipse.jgit.http.apache"
@@ -54,10 +97,6 @@
          version="5.0.0"/>
          
    <includes
-         id="org.eclipse.m2e.feature"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.emf"
          version="0.0.0"/>
 
@@ -336,7 +375,7 @@
       <import plugin="org.apache.sshd.core"/>
       <import plugin="org.apache.mina.core"/>
       <import plugin="javax.xml"/>
-      <import plugin="javax.servlet" version="3.0.0" match="equivalent"/>
+      <import plugin="javax.servlet" />
       <import plugin="org.eclipse.osgi"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.core.jobs"/>
@@ -1229,7 +1268,7 @@
          download-size="0"
          install-size="0"
          version="2.13.0"
-	 unpack="false"/>
+	 		unpack="false"/>
 			
   <plugin
          id="org.eclipse.jsch.core"
@@ -2021,14 +2060,152 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
+   
+   <plugin
+         id="org.eclipse.m2e.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+       
+   <plugin
+         id="org.eclipse.m2e.maven.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+   <plugin
+         id="org.eclipse.m2e.maven.runtime.slf4j.simple"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>         
+   <plugin
+         id="org.eclipse.m2e.archetype.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>    
+                  
+                
+   <plugin
+         id="org.eclipse.m2e.maven.indexer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>      
+ 
    <plugin
+         id="org.eclipse.m2e.workspace.cli"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>  
+                            
+	<plugin
+         id="com.thoughtworks.qdox"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>     
+	
+	<plugin
+         id="org.eclipse.wst.xml.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+	
+	<plugin
+         id="org.eclipse.wst.sse.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+	<plugin
          id="org.eclipse.wst.common.emf"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
+                                    
+	<plugin
+         id="org.eclipse.emf.mwe.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+   	
+    <plugin
+         id="org.eclipse.jem.util"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="org.eclipse.wst.xsd.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+   <plugin
+         id="javax.xml.soap"
+         download-size="0"
+         install-size="0"
+         version="1.2.0"
+         unpack="false"/> 
+         
+   <plugin
+         id="org.apache.wsil4j"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>      
+   
+   <plugin
+         id="org.uddi4j"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>   
+         
+  <plugin
+         id="org.eclipse.wst.internet.monitor.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>          
+  
+  <plugin
+         id="org.eclipse.wst.common.project.facet.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>      
+         
+   <plugin
+         id="org.eclipse.jetty.webapp"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>    
+         
+   <plugin
+         id="java_cup.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/> 
+         
+   <plugin
+         id="org.eclipse.jetty.xml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>    
+         
    <plugin
          id="org.apache.commons.lang3"
          download-size="0"
diff --git a/features/org.eclipse.osee.dep.feature/pom.xml b/features/org.eclipse.osee.dep.feature/pom.xml
index fb64a21c8e9..661e6c9a613 100644
--- a/features/org.eclipse.osee.dep.feature/pom.xml
+++ b/features/org.eclipse.osee.dep.feature/pom.xml
@@ -29,15 +29,23 @@
 						<configuration>
 							<excludes>
 								<plugin id="org.apache.xerces" />
+								<plugin id="org.eclipse.m2e.maven.runtime" />
+								<plugin id="org.eclipse.m2e.archetype.common" />
+								<plugin id="org.eclipse.m2e.maven.indexer" />
+								<plugin id="org.eclipse.m2e.workspace.cli" />
 								<plugin id="javax.xml" />
 								<plugin id="org.apache.xml.resolver" />
 								<plugin id="org.apache.xml.serializer" />								
 								<plugin id="org.aopalliance" />
 								<plugin id="jms.libraries" />
+								<plugin id="org.eclipse.wst.xml.ui" />
+								<plugin id="org.eclipse.wst.common.emf" />
+								<plugin id="org.eclipse.jem.util" />
 								<plugin id="org.json" />
 								<plugin id="org.apache.cxf.core.config" />
 								<plugin id="javax.ws.rs" />
 								<plugin id="javax.wsdl" />
+								<plugin id="org.eclipse.m2e.maven.runtime.slf4j.simple" />
 								<plugin id="org.eclipse.xtext" />
 								<plugin id="org.antlr.runtime" />
 								<plugin id="com.google.guava" />
@@ -45,6 +53,7 @@
 								<plugin id="org.apache.commons.io" />
 								<plugin id="org.apache.commons.cli" />
 								<plugin id="org.eclipse.team.svn" />
+								<plugin id="org.eclipse.wst.sse.ui" />
 								<plugin id="org.eclipse.team.svn.core" />
 								<plugin id="ch.qos.logback.slf4j" />
 								<plugin id="org.jsoup" />
@@ -52,6 +61,11 @@
 								<plugin id="org.eclipse.swt" />
 								<plugin id="org.eclipse.wst.common.project.facet.core" />
 								<plugin id="org.eclipse.wst.xml.core" />
+								<plugin id="org.uddi4j" />
+								<plugin id="org.eclipse.wst.internet.monitor.core" />	
+								<plugin id="org.eclipse.wst.common.project.facet.ui" />			
+								<plugin id="org.eclipse.jetty.webapp" />	
+								<plugin id="org.eclipse.jetty.xml" />								
 								<plugin id="org.eclipse.wst.sse.core" />
 								<plugin id="org.eclipse.wst.common.uriresolver" />
 								<plugin id="org.eclipse.wst.common.core" />
@@ -61,6 +75,7 @@
 								<plugin id="org.eclipse.gmf.runtime.emf.type.core" />
 								<plugin id="org.eclipse.gmf.runtime.emf.ui" />
 								<plugin id="org.eclipse.uml2.uml" />
+							   <plugin id="org.apache.wsil4j" />
 								<plugin id="org.eclipse.uml2.uml.resources" />
 								<plugin id="org.eclipse.uml2.uml.edit" />
 								<plugin id="org.eclipse.uml2.uml.editor" />
@@ -74,18 +89,33 @@
 								<plugin id="org.eclipse.uml2.common" />
 								<plugin id="org.eclipse.uml2.common.edit" />
 								<plugin id="org.apache.batik.pdf" />
-								<plugin id="org.eclipse.ocl.common" />								
+								<plugin id="org.eclipse.ocl.common" />		
+								<plugin id="javax.xml.soap" />								
 								<plugin id="org.hamcrest" />
-								<plugin id="javax.xml.bind" />					
+								<plugin id="javax.xml.bind" />	
+								<plugin id="org.eclipse.wst.xsd.core" />					
 								<plugin id="org.eclipse.ocl.ecore" />
 								<feature id="org.eclipse.graphiti.feature" />					
 								<feature id="org.eclipse.graphiti.feature.source" />
 								<feature id="org.eclipse.equinox.server.jetty" />
 								<feature id="org.eclipse.emf.doc" />
+								<feature id="org.eclipse.m2e.logback.feature" />
+								<feature id="org.eclipse.m2e.sdk.feature" />
 								<feature id="org.eclipse.xtext.runtime" />
+								<feature id="'org.eclipse.wst.xml_ui.feature" />
 								<feature id="org.eclipse.xtext.xbase" />
 								<feature id="org.eclipse.xtext.ui" />
+								<feature id="org.eclipse.wst.common_core.feature" />
+								<feature id="org.eclipse.wst.xml.xpath2.processor.feature" />
+							   <feature id="org.eclipse.wst.ws_core.feature" />
+							   <feature id="org.eclipse.wst.server_userdoc.feature" />
+								<feature id="org.eclipse.wst.xsl.feature" />
+							   <plugin id="java_cup.runtime" />
+								<feature id="org.eclipse.wst.server_core.feature" />		
+							   <feature id="org.eclipse.wst.server_adapters.feature" />	
+							   <feature id="org.eclipse.wst.server_ui.feature" />																					
 								<feature id="org.eclipse.jgit.lfs" />
+							   <feature id="org.eclipse.wst.common_ui.feature" />
 							  	<feature id="org.eclipse.jgit.http.apache" />
 								<plugin id="org.eclipse.uml2.codegen.ecore" />
 								<feature id="org.eclipse.core.runtime.feature" />
@@ -164,7 +194,9 @@
 						</goals>
 					</execution>
 				</executions>
+				
 			</plugin>
+			
 		</plugins>
 	</build>