feature[ats_L53J4]: Add com.google.guava 12.0.0

Change-Id: I17f8b86289710178aaff27303531e7ed7c9204e2

4 files changed, 29 insertions, 31 deletions

diff --git a/features/org.eclipse.osee.x.server.external.feature/feature.xml b/features/org.eclipse.osee.x.server.external.feature/feature.xml
index 98e68385ffc..2b5681d8348 100644
--- a/features/org.eclipse.osee.x.server.external.feature/feature.xml
+++ b/features/org.eclipse.osee.x.server.external.feature/feature.xml
@@ -18,34 +18,32 @@
    </license>
 
    <requires>
-      <import plugin="org.eclipse.osgi" version="3.7.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.common" version="3.6.100" match="compatible"/>
-      <import plugin="org.eclipse.core.jobs" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.registry" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.preferences" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.core.contenttype" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.app" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.common" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.preferences" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.registry" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.osgi"/>
       <import plugin="org.eclipse.osgi.services"/>
-      <import plugin="org.eclipse.equinox.security" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.common" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.preferences" version="3.2.200" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.osgi" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.registry" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.5.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.common" version="2.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.util" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.equinox.app"/>
+      <import plugin="org.eclipse.equinox.common"/>
+      <import plugin="org.eclipse.equinox.preferences"/>
+      <import plugin="org.eclipse.equinox.registry"/>
+      <import plugin="org.eclipse.equinox.security"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.jobs"/>
+      <import plugin="org.eclipse.core.contenttype"/>
+
       <import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.3.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.common" version="2.8.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.8.0" match="compatible"/>
+
       <import plugin="org.slf4j.api"/>
+      
       <import plugin="org.apache.sshd.core"/>
       <import plugin="org.apache.mina.core"/>
+      
+      <import plugin="com.google.guava" version="10.0.1.v201203051515" match="perfect"/>
+      <import plugin="com.google.guava" version="12.0.0" match="greaterOrEqual"/>
+      
+      <import feature="org.eclipse.xtext.runtime" version="2.3.1"/>
+      <import feature="org.eclipse.emf" version="2.8.0"/>
+      <import feature="org.eclipse.emf.common" version="2.8.0"/>
+      <import feature="org.eclipse.emf.compare" version="1.3.2"/>
+      <import feature="org.eclipse.emf.ecore" version="2.8.0"/>
    </requires>
 
    <plugin
@@ -321,11 +319,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.google.guava"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF
index 1ba2105b863..ee528259467 100644
--- a/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.11.0.qualifier
 Bundle-Vendor: Eclipse Open System Engineering Environment
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/*.xml
-Import-Package: com.google.common.collect;version="1.0.0",
+Import-Package: com.google.common.collect,
  org.eclipse.osee.console.admin,
  org.eclipse.osee.executor.admin,
  org.eclipse.osee.framework.core.data,
diff --git a/plugins/org.eclipse.osee.orcs.core/build.properties b/plugins/org.eclipse.osee.orcs.core/build.properties
index 67c94bd9d33..a2ab25ab733 100644
--- a/plugins/org.eclipse.osee.orcs.core/build.properties
+++ b/plugins/org.eclipse.osee.orcs.core/build.properties
@@ -9,6 +9,7 @@ additional.bundles = org.eclipse.osee.logger,\
                      org.eclipse.osee.framework.jdk.core,\
                      org.eclipse.osee.framework.core.model,\
                      org.eclipse.core.runtime,\
+                     com.google.guava,\
                      org.eclipse.osee.executor.admin,\
                      org.eclipse.osee.console.admin,\
                      org.eclipse.osee.framework.resource.management
diff --git a/plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml b/plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml
index 98b6308b423..220bf0085a7 100644
--- a/plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml
+++ b/plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml
@@ -144,6 +144,12 @@
 								<echo file="@{configPath}/config.ini" message="${projectName}" append="true" />
 							</then>
 						</elseif>
+						<elseif>
+							<equals arg1="${projectName}" arg2="com.google.guava" />
+							<then>
+								<echo file="@{configPath}/config.ini" message="${jarFilename}@start" append="true" />
+							</then>
+						</elseif>
 						<else>
 							<echo file="@{configPath}/config.ini" message="${projectName}@start" append="true" />
 						</else>