removed guava from lib folder and added it's update-site to target platform to circumvent license issues

7 files changed, 23 insertions, 7 deletions

diff --git a/org.genivi.commonapi.core/.classpath b/org.genivi.commonapi.core/.classpath
index f0ff324..d08eb39 100644
--- a/org.genivi.commonapi.core/.classpath
+++ b/org.genivi.commonapi.core/.classpath
@@ -6,6 +6,5 @@
 	<classpathentry kind="src" path="xtend-gen"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/guava-14.0.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.genivi.commonapi.core/.gitignore b/org.genivi.commonapi.core/.gitignore
index ea8c4bf..869face 100644
--- a/org.genivi.commonapi.core/.gitignore
+++ b/org.genivi.commonapi.core/.gitignore
@@ -1 +1,2 @@
 /target
+/lib/guava-14.0.1.jar
\ No newline at end of file
diff --git a/org.genivi.commonapi.core/META-INF/MANIFEST.MF b/org.genivi.commonapi.core/META-INF/MANIFEST.MF
index 8d111fe..6be463a 100644
--- a/org.genivi.commonapi.core/META-INF/MANIFEST.MF
+++ b/org.genivi.commonapi.core/META-INF/MANIFEST.MF
@@ -13,9 +13,10 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.8.0",
  org.eclipse.xtext.builder;bundle-version="2.4.0",
  org.franca.core.dsl;bundle-version="0.8.9",
  org.franca.deploymodel.dsl;bundle-version="0.8.9",
- org.eclipse.jface
+ org.eclipse.jface,
+ com.google.guava;bundle-version="15.0.0"
 Import-Package: javax.inject;version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.genivi.commonapi.core.deployment,org.genivi.common
  api.core.generator, org.genivi.commonapi.core.preferences
-Bundle-ClassPath: .,lib/guava-14.0.1.jar
+Bundle-ClassPath: .
diff --git a/org.genivi.commonapi.core/build.properties b/org.genivi.commonapi.core/build.properties
index ea1f755..c24af96 100644
--- a/org.genivi.commonapi.core/build.properties
+++ b/org.genivi.commonapi.core/build.properties
@@ -1,8 +1,7 @@
 source.. = src/,\
 		   src-gen/,\
-           xtend-gen/
+           xtend-gen/,\
+           deployment/
 bin.includes = META-INF/,\
                .,\
-               lib/guava-14.0.1.jar,\
                deployment/
-src.includes = deployment/
diff --git a/org.genivi.commonapi.core/lib/guava-14.0.1.jar b/org.genivi.commonapi.core/lib/guava-14.0.1.jar
deleted file mode 100644
index 3a3d925..0000000
--- a/org.genivi.commonapi.core/lib/guava-14.0.1.jar
+++ /dev/null
diff --git a/org.genivi.commonapi.parent.releng/pom.xml b/org.genivi.commonapi.parent.releng/pom.xml
index dae78c2..5f161c6 100644
--- a/org.genivi.commonapi.parent.releng/pom.xml
+++ b/org.genivi.commonapi.parent.releng/pom.xml
@@ -12,6 +12,13 @@
         <maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
         <xtend-version>2.4.3</xtend-version>
     </properties>
+    <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>15.0</version>
+        </dependency>
+    </dependencies>
     <repositories>
         <repository>
             <id>dbus-emf</id>
@@ -33,6 +40,11 @@
             <layout>p2</layout>
             <url>http://franca.eclipselabs.org.codespot.com/git/update_site/releases/</url>
         </repository>
+        <repository>
+            <id>Orbit</id>
+            <layout>p2</layout>
+            <url>http://download.eclipse.org/tools/orbit/downloads/drops/S20140428023358/repository/</url>
+        </repository>
     </repositories>
     <build>
         <plugins>
diff --git a/org.genivi.commonapi.target/org.genivi.commonapi.target.target b/org.genivi.commonapi.target/org.genivi.commonapi.target.target
index 407682d..3059d0e 100644
--- a/org.genivi.commonapi.target/org.genivi.commonapi.target.target
+++ b/org.genivi.commonapi.target/org.genivi.commonapi.target.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Common API" sequenceNumber="17">
+<?pde version="3.8"?><target name="Common API" sequenceNumber="19">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.platform.sdk" version="4.3.1.M20130911-1000"/>
@@ -20,5 +20,9 @@
 <unit id="org.franca.feature.feature.group" version="0.8.10.201309262002"/>
 <repository location="http://franca.eclipselabs.org.codespot.com/git/update_site/releases/"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.google.guava" version="15.0.0.v201403281430"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20140428023358/repository/"/>
+</location>
 </locations>
 </target>