feature: Put sdk back into build

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

9 files changed, 91 insertions, 34 deletions

diff --git a/features/org.eclipse.osee.core.server.external.feature/feature.xml b/features/org.eclipse.osee.core.server.external.feature/feature.xml
index 3498b80434d..b047fd26322 100644
--- a/features/org.eclipse.osee.core.server.external.feature/feature.xml
+++ b/features/org.eclipse.osee.core.server.external.feature/feature.xml
@@ -25,6 +25,7 @@
          id="org.eclipse.osee.disposition.feature"
          version="0.0.0"/>
 
+
    <includes
          id="org.eclipse.egit"
          version="4.4.0"/>
@@ -32,7 +33,34 @@
    <includes
          id="org.eclipse.jgit"
          version="4.4.0"/>
- 
+         
+   <plugin
+         id="org.eclipse.jdt.annotation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+  <plugin
+        id="org.eclipse.jdt.launching"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>        
+       
+ <plugin
+         id="org.eclipse.jdt.debug"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.jdt.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>       
+              
     <plugin
          id="org.eclipse.egit"
          download-size="0"
@@ -566,13 +594,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.jdt.annotation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.apache.felix.gogo.command"
          download-size="0"
          install-size="0"
@@ -1097,12 +1118,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.jdt.launching"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
    <plugin
          id="org.eclipse.nebula.widgets.xviewer.core"
@@ -1119,19 +1134,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.jdt.debug"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jdt.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.osee.account.admin"
          download-size="0"
          install-size="0"
diff --git a/features/org.eclipse.osee.core.server.external.feature/pom.xml b/features/org.eclipse.osee.core.server.external.feature/pom.xml
index 24377a9bb9b..f51cd36ceb1 100644
--- a/features/org.eclipse.osee.core.server.external.feature/pom.xml
+++ b/features/org.eclipse.osee.core.server.external.feature/pom.xml
@@ -60,6 +60,11 @@
 							   <plugin id="org.eclipse.persistence.moxy" />
 							   <plugin id="org.json" />
 							   <plugin id="org.jsoup" />
+							   <plugin id="org.apache.commons.codec" />
+							   							   <plugin id="org.eclipse.sdk" />
+							   
+							   <feature id="org.eclipse.sdk" />
+							   <feature id="org.eclipse.wtp.capabilities.feature" />
 							</excludes>
 						</configuration>
 					</execution>
diff --git a/features/org.eclipse.osee.dep.feature/feature.xml b/features/org.eclipse.osee.dep.feature/feature.xml
index 7f1f4b4e80f..e05f00469ed 100644
--- a/features/org.eclipse.osee.dep.feature/feature.xml
+++ b/features/org.eclipse.osee.dep.feature/feature.xml
@@ -46,10 +46,6 @@
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.jdt"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.emf"
          version="0.0.0"/>
 
@@ -260,6 +256,10 @@
    <includes
          id="org.eclipse.sdk"
          version="0.0.0"/>
+         
+<includes
+         id="org.eclipse.jdt"
+         version="0.0.0"/>
 
    <includes
          id="org.eclipse.ecf.core.feature"
diff --git a/features/org.eclipse.osee.external.feature/feature.xml b/features/org.eclipse.osee.external.feature/feature.xml
index 992fb3ed248..3a1bf9f3bf6 100644
--- a/features/org.eclipse.osee.external.feature/feature.xml
+++ b/features/org.eclipse.osee.external.feature/feature.xml
@@ -53,6 +53,13 @@
       <import plugin="javax.annotation" version="1.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.team.svn.core"/>
    </requires>
+      
+   <plugin
+            id="org.eclipse.sdk"
+            download-size="0"
+            install-size="0"
+            version="0.0.0"
+            unpack="false"/>
    
    <plugin
          id="com.fasterxml.jackson.core.jackson-core"
diff --git a/features/org.eclipse.osee.external.feature/pom.xml b/features/org.eclipse.osee.external.feature/pom.xml
index 8d3a22e58b5..a25e68e8b9c 100644
--- a/features/org.eclipse.osee.external.feature/pom.xml
+++ b/features/org.eclipse.osee.external.feature/pom.xml
@@ -35,6 +35,7 @@
 								<plugin id="org.apache.xml.serializer" />								
 								<plugin id="org.aopalliance" />
 								<plugin id="jms.libraries" />
+								<plugin id="org.eclipse.sdk" />
 								<plugin id="org.json" />
 								<plugin id="org.apache.cxf.core.config" />
 								<plugin id="ch.qos.logback.slf4j" />
diff --git a/features/org.eclipse.osee.framework.feature/feature.xml b/features/org.eclipse.osee.framework.feature/feature.xml
index 945cb3f71a1..3c3c14323d8 100644
--- a/features/org.eclipse.osee.framework.feature/feature.xml
+++ b/features/org.eclipse.osee.framework.feature/feature.xml
@@ -17,7 +17,6 @@
       %license
    </license>
 
-         
    <requires>
       <import feature="org.eclipse.emf.ecore" version="2.5.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.emf.common" version="2.5.0" match="greaterOrEqual"/>
@@ -34,7 +33,7 @@
       <import plugin="org.apache.commons.dbcp" version="1.4.0" match="compatible"/>
       <import plugin="org.apache.commons.pool" version="1.6.0" match="compatible"/>
       <import plugin="org.mockito" version="2.13.0" match="greaterOrEqual"/>            
-	  <import plugin="javax.annotation" version="1.2.0" match="greaterOrEqual"/>            
+      <import plugin="javax.annotation" version="1.2.0" match="greaterOrEqual"/>            
       <import plugin="com.fasterxml.jackson.core.jackson-core" version="2.9.2" match="greaterOrEqual"/>
       <import plugin="com.fasterxml.jackson.core.jackson-annotations" version="2.9.2" match="greaterOrEqual" />
       <import plugin="com.fasterxml.jackson.core.jackson-databind" version="2.9.2" match="greaterOrEqual" />     
@@ -46,6 +45,38 @@
       <import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual" />		      
    </requires>
 
+
+   <plugin
+         id="org.eclipse.sdk"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+         
+
+   <plugin
+         id="org.eclipse.jdt.launching"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+     
+   <plugin
+         id="org.eclipse.jdt.debug"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+         
+    <plugin
+         id="org.eclipse.jdt.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>     
+         
+    <plugin
+         id="org.eclipse.jdt.annotation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>          
+         
    <plugin
          id="rest.assured"
          download-size="0"
diff --git a/features/org.eclipse.osee.framework.feature/pom.xml b/features/org.eclipse.osee.framework.feature/pom.xml
index 9105d0f826a..72ff53cc546 100644
--- a/features/org.eclipse.osee.framework.feature/pom.xml
+++ b/features/org.eclipse.osee.framework.feature/pom.xml
@@ -31,6 +31,9 @@
 							   <plugin id="org.eclipse.osee.framework.templates" />
 							   <plugin id="org.hamcrest" />
 							   <plugin id="org.eclipse.egit" />
+							   <feature id="org.eclipse.sdk" />
+							    <plugin id="org.eclipse.sdk" />
+							   <feature id="org.eclipse.wtp.capabilities.feature" />
 							</excludes>
 						</configuration>
 					</execution>
diff --git a/features/org.eclipse.osee.framework.ui.feature/feature.xml b/features/org.eclipse.osee.framework.ui.feature/feature.xml
index a5d17e4d91a..3c38eb74379 100644
--- a/features/org.eclipse.osee.framework.ui.feature/feature.xml
+++ b/features/org.eclipse.osee.framework.ui.feature/feature.xml
@@ -86,6 +86,13 @@
    </requires>
       
    <plugin
+            id="org.eclipse.sdk"
+            download-size="0"
+            install-size="0"
+            version="0.0.0"
+            unpack="false"/>      
+      
+   <plugin
          id="org.eclipse.osee.framework.ui.product"
          download-size="0"
          install-size="0"
diff --git a/features/org.eclipse.osee.framework.ui.feature/pom.xml b/features/org.eclipse.osee.framework.ui.feature/pom.xml
index c054c6b8577..6f5d9f5ee46 100644
--- a/features/org.eclipse.osee.framework.ui.feature/pom.xml
+++ b/features/org.eclipse.osee.framework.ui.feature/pom.xml
@@ -30,7 +30,8 @@
 							<excludes>
 								<plugin id="org.eclipse.osee.framework.ui.product" />
 								<plugin id="org.eclipse.osee.framework.dev.help.ui" />
-							        <plugin id="org.hamcrest" />
+							   <plugin id="org.hamcrest" />
+							   <plugin id="org.eclipse.sdk" />
 							</excludes>
 						</configuration>
 					</execution>