Google Git
Sign in
eclipse/intent/org.eclipse.mylyn.docs.intent.main/e4f106becabb127fe7b93fa8919d3f922eb2ba36^!/.
commit
e4f106becabb127fe7b93fa8919d3f922eb2ba36
[log] [tgz]
author
Alex Lagarde <alex.lagarde@obeo.fr>
Tue May 20 15:10:18 2014 +0200
committer
Alex Lagarde <alex.lagarde@obeo.fr>
Tue May 20 15:10:18 2014 +0200
tree
4bbb396ce5ceaf765eb913e8ba1cfcb04aab145d
parent
c19773f4fecba866809e3d32c1554e1b29eaaa43 [diff]
[build] Update Luna TP for RC1

diff --git a/plugins/org.eclipse.mylyn.docs.intent.client.compiler/META-INF/MANIFEST.MF b/plugins/org.eclipse.mylyn.docs.intent.client.compiler/META-INF/MANIFEST.MF
index b76e126..20172e6 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.client.compiler/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.mylyn.docs.intent.client.compiler/META-INF/MANIFEST.MF

@@ -10,7 +10,7 @@
  org.eclipse.mylyn.docs.intent.core,
  org.eclipse.mylyn.docs.intent.collab,
  org.eclipse.mylyn.docs.intent.collab.common,
- com.google.guava;bundle-version="[12.0.0,13.0.0)"
+ com.google.guava;bundle-version="[11.0.0,15.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: 
  org.eclipse.mylyn.docs.intent.client.compiler,

diff --git a/plugins/org.eclipse.mylyn.docs.intent.client.linkresolver/META-INF/MANIFEST.MF b/plugins/org.eclipse.mylyn.docs.intent.client.linkresolver/META-INF/MANIFEST.MF
index c18b333..3d1a4bd 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.client.linkresolver/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.mylyn.docs.intent.client.linkresolver/META-INF/MANIFEST.MF

@@ -9,7 +9,7 @@
  org.eclipse.mylyn.docs.intent.core;bundle-version="0.7.0",
  org.eclipse.mylyn.docs.intent.collab;bundle-version="0.7.0",
  org.eclipse.mylyn.docs.intent.collab.common;bundle-version="0.7.0",
- com.google.guava;bundle-version="[12.0.0,13.0.0)"
+ com.google.guava;bundle-version="[11.0.0,15.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.mylyn.docs.intent.client.linkresolver.repository,
  org.eclipse.mylyn.docs.intent.client.linkresolver.resolver

diff --git a/plugins/org.eclipse.mylyn.docs.intent.client.synchronizer/META-INF/MANIFEST.MF b/plugins/org.eclipse.mylyn.docs.intent.client.synchronizer/META-INF/MANIFEST.MF
index 33b7025..78fae91 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.client.synchronizer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.mylyn.docs.intent.client.synchronizer/META-INF/MANIFEST.MF

@@ -11,7 +11,7 @@
  org.eclipse.mylyn.docs.intent.collab,
  org.eclipse.mylyn.docs.intent.collab.common,
  org.eclipse.emf.edit.ui;bundle-version="2.6.0",
- com.google.guava;bundle-version="[12.0.0,13.0.0)",
+ com.google.guava;bundle-version="[11.0.0,15.0.0)",
  org.eclipse.mylyn.docs.intent.compare;bundle-version="0.7.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy

diff --git a/plugins/org.eclipse.mylyn.docs.intent.client.ui.cdo/META-INF/MANIFEST.MF b/plugins/org.eclipse.mylyn.docs.intent.client.ui.cdo/META-INF/MANIFEST.MF
index a80fc25..5e810c0 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.client.ui.cdo/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.mylyn.docs.intent.client.ui.cdo/META-INF/MANIFEST.MF

@@ -16,6 +16,6 @@
  org.eclipse.mylyn.docs.intent.client.ui,
  org.eclipse.mylyn.docs.intent.client.synchronizer,
  org.eclipse.mylyn.docs.intent.client.linkresolver,
- com.google.guava;bundle-version="[12.0.0,13.0.0)"
+ com.google.guava;bundle-version="[11.0.0,15.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/org.eclipse.mylyn.docs.intent.client.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.mylyn.docs.intent.client.ui/META-INF/MANIFEST.MF
index 7da5651..89238bf 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.client.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.mylyn.docs.intent.client.ui/META-INF/MANIFEST.MF

@@ -20,7 +20,7 @@
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.jface.text,
  org.eclipse.core.expressions;bundle-version="3.4.300",
- com.google.guava;bundle-version="[12.0.0,13.0.0)",
+ com.google.guava;bundle-version="[11.0.0,15.0.0)",
  org.eclipse.compare,
  org.eclipse.mylyn.docs.intent.modelingunit.update;bundle-version="0.7.0",
  org.eclipse.emf.compare.ide.ui;bundle-version="3.1.0",

diff --git a/plugins/org.eclipse.mylyn.docs.intent.collab.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.mylyn.docs.intent.collab.common/META-INF/MANIFEST.MF
index 64f2681..f02d2f2 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.collab.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.mylyn.docs.intent.collab.common/META-INF/MANIFEST.MF

@@ -15,7 +15,7 @@
  org.eclipse.mylyn.docs.intent.collab.common.utils
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.mylyn.docs.intent.collab,
- com.google.guava;bundle-version="[12.0.0,13.0.0)",
+ com.google.guava;bundle-version="[11.0.0,15.0.0)",
  org.eclipse.mylyn.docs.intent.core;bundle-version="0.7.0",
  org.eclipse.mylyn.docs.intent.parser;bundle-version="0.7.0",
  org.eclipse.emf

diff --git a/plugins/org.eclipse.mylyn.docs.intent.collab.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.mylyn.docs.intent.collab.ide/META-INF/MANIFEST.MF
index ef8bcd8..a4b0d60 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.collab.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.mylyn.docs.intent.collab.ide/META-INF/MANIFEST.MF

@@ -9,7 +9,7 @@
  org.eclipse.mylyn.docs.intent.collab;visibility:=reexport,
  org.eclipse.core.resources;visibility:=reexport,
  org.eclipse.emf.transaction;bundle-version="1.4.0";visibility:=reexport,
- com.google.guava;bundle-version="[12.0.0,13.0.0)"
+ com.google.guava;bundle-version="[11.0.0,15.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.mylyn.docs.intent.collab.ide.repository,

diff --git a/plugins/org.eclipse.mylyn.docs.intent.collab/META-INF/MANIFEST.MF b/plugins/org.eclipse.mylyn.docs.intent.collab/META-INF/MANIFEST.MF
index 9f7ab1b..e2ba389 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.collab/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.mylyn.docs.intent.collab/META-INF/MANIFEST.MF

@@ -7,7 +7,7 @@
 Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,
  org.eclipse.core.runtime;visibility:=reexport,
- com.google.guava;bundle-version="[12.0.0,13.0.0)",
+ com.google.guava;bundle-version="[11.0.0,15.0.0)",
  org.eclipse.emf.compare;bundle-version="3.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/org.eclipse.mylyn.docs.intent.compare/META-INF/MANIFEST.MF b/plugins/org.eclipse.mylyn.docs.intent.compare/META-INF/MANIFEST.MF
index 032f03f..c09a9a6 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.compare/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.mylyn.docs.intent.compare/META-INF/MANIFEST.MF

@@ -6,7 +6,7 @@
 Bundle-Version: 0.9.0.qualifier
 Require-Bundle: org.eclipse.mylyn.docs.intent.core, 
  org.eclipse.emf.compare;bundle-version="3.0.0";visibility:=reexport,
- com.google.guava;bundle-version="[12.0.0,13.0.0)",
+ com.google.guava;bundle-version="[11.0.0,15.0.0)",
  org.eclipse.mylyn.docs.intent.parser;bundle-version="0.7.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/org.eclipse.mylyn.docs.intent.compare/src/org/eclipse/mylyn/docs/intent/compare/match/EditionDistance.java b/plugins/org.eclipse.mylyn.docs.intent.compare/src/org/eclipse/mylyn/docs/intent/compare/match/EditionDistance.java
index 32f87ee..ecc263a 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.compare/src/org/eclipse/mylyn/docs/intent/compare/match/EditionDistance.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.compare/src/org/eclipse/mylyn/docs/intent/compare/match/EditionDistance.java

@@ -35,10 +35,10 @@
 import org.eclipse.emf.compare.internal.spec.ComparisonSpec;
 import org.eclipse.emf.compare.match.DefaultEqualityHelperFactory;
 import org.eclipse.emf.compare.match.IEqualityHelperFactory;
+import org.eclipse.emf.compare.match.eobject.DefaultWeightProvider;
 import org.eclipse.emf.compare.match.eobject.ProximityEObjectMatcher.DistanceFunction;
 import org.eclipse.emf.compare.match.eobject.URIDistance;
 import org.eclipse.emf.compare.match.eobject.WeightProvider;
-import org.eclipse.emf.compare.match.eobject.internal.ReflectiveWeightProvider;
 import org.eclipse.emf.compare.utils.DiffUtil;
 import org.eclipse.emf.compare.utils.EqualityHelper;
 import org.eclipse.emf.compare.utils.IEqualityHelper;
@@ -92,7 +92,7 @@
 	/**
 	 * instance providing the weight for each feature.
 	 */
-	private WeightProvider weights = new ReflectiveWeightProvider();
+	private WeightProvider weights = new DefaultWeightProvider();
 
 	private Notifier leftRoot;
 

diff --git a/plugins/org.eclipse.mylyn.docs.intent.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.mylyn.docs.intent.core/META-INF/MANIFEST.MF
index 743308a..a24ec56 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.mylyn.docs.intent.core/META-INF/MANIFEST.MF

@@ -24,6 +24,6 @@
 Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.cdo;visibility:=reexport,
  org.eclipse.mylyn.docs.intent.markup;visibility:=reexport,
- com.google.guava;bundle-version="[12.0.0,13.0.0)"
+ com.google.guava;bundle-version="[11.0.0,15.0.0)"
 Bundle-ActivationPolicy: lazy
 

diff --git a/plugins/org.eclipse.mylyn.docs.intent.exporter/META-INF/MANIFEST.MF b/plugins/org.eclipse.mylyn.docs.intent.exporter/META-INF/MANIFEST.MF
index a3d5e6a..5b13974 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.exporter/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.mylyn.docs.intent.exporter/META-INF/MANIFEST.MF

@@ -16,7 +16,7 @@
  org.eclipse.acceleo.model;bundle-version="3.5.0";visibility:=reexport,
  org.eclipse.acceleo.profiler;bundle-version="3.5.0";visibility:=reexport,
  org.eclipse.acceleo.engine;bundle-version="3.5.0";visibility:=reexport,
- com.google.guava;bundle-version="[12.0.0,13.0.0)",
+ com.google.guava;bundle-version="[11.0.0,15.0.0)",
  org.eclipse.mylyn.docs.intent.core;visibility:=reexport,
  org.eclipse.mylyn.docs.intent.markup.gen,
  org.eclipse.emf.edit,

diff --git a/plugins/org.eclipse.mylyn.docs.intent.external.parser/META-INF/MANIFEST.MF b/plugins/org.eclipse.mylyn.docs.intent.external.parser/META-INF/MANIFEST.MF
index aa3eff9..2a2737e 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.external.parser/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.mylyn.docs.intent.external.parser/META-INF/MANIFEST.MF

@@ -8,7 +8,7 @@
  org.eclipse.swt,
  org.eclipse.mylyn.docs.intent.core,
  org.eclipse.mylyn.docs.intent.collab,
- com.google.guava;bundle-version="[12.0.0,13.0.0)",
+ com.google.guava;bundle-version="[11.0.0,15.0.0)",
  org.eclipse.mylyn.docs.intent.collab.common
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/org.eclipse.mylyn.docs.intent.markup.gen/META-INF/MANIFEST.MF b/plugins/org.eclipse.mylyn.docs.intent.markup.gen/META-INF/MANIFEST.MF
index 6002a23..8661f11 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.markup.gen/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.mylyn.docs.intent.markup.gen/META-INF/MANIFEST.MF

@@ -17,7 +17,7 @@
  org.eclipse.mylyn.docs.intent.markup,
  org.eclipse.ocl.ecore,
  org.eclipse.emf.ecore;visibility:=reexport,
- com.google.guava;bundle-version="[12.0.0,13.0.0)",
+ com.google.guava;bundle-version="[11.0.0,15.0.0)",
  org.eclipse.acceleo.parser;bundle-version="3.5.0",
  org.eclipse.acceleo.engine;bundle-version="3.5.0",
  org.eclipse.swt

diff --git a/plugins/org.eclipse.mylyn.docs.intent.markup/META-INF/MANIFEST.MF b/plugins/org.eclipse.mylyn.docs.intent.markup/META-INF/MANIFEST.MF
index 2166d7c..7d2b0ff 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.markup/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.mylyn.docs.intent.markup/META-INF/MANIFEST.MF

@@ -22,5 +22,5 @@
  org.eclipse.emf.cdo;visibility:=reexport,
  org.eclipse.mylyn.wikitext.textile.core,
  org.eclipse.mylyn.wikitext.mediawiki.core,
- com.google.guava;bundle-version="[12.0.0,13.0.0)"
+ com.google.guava;bundle-version="[11.0.0,15.0.0)"
 Bundle-ActivationPolicy: lazy

diff --git a/plugins/org.eclipse.mylyn.docs.intent.parser/META-INF/MANIFEST.MF b/plugins/org.eclipse.mylyn.docs.intent.parser/META-INF/MANIFEST.MF
index 095491b..a36d3d6 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.parser/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.mylyn.docs.intent.parser/META-INF/MANIFEST.MF

@@ -12,7 +12,7 @@
  org.eclipse.mylyn.docs.intent.markup,
  org.eclipse.mylyn.wikitext.core,
  org.eclipse.mylyn.wikitext.textile.core,
- com.google.guava;bundle-version="[12.0.0,13.0.0)"
+ com.google.guava;bundle-version="[11.0.0,15.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.mylyn.docs.intent.parser,
  org.eclipse.mylyn.docs.intent.parser.descriptionunit,

diff --git a/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/luna-sdk.target b/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/luna-sdk.target
index e385f52..2ff495d 100644
--- a/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/luna-sdk.target
+++ b/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/luna-sdk.target

@@ -1,27 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-
-<target name="Luna SDK" sequenceNumber="0">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="4.4.0.I20140123-1600"/>
-<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="2.0.0.20131219-0024"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.10.0.v20140127-0448"/>
-<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.8.0.201401271944"/>
-<unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.8.0.201401271716"/>
-<unit id="org.eclipse.emf.compare.feature.group" version="2.2.0.201401281325"/>
-<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="2.2.0.201401281325"/>
-<unit id="org.eclipse.jdt.feature.group" version="3.10.0.v20140123-1600"/>
-<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="4.3.0.v20140129-1702"/>
-<unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.11.0.20131021-1909"/>
-<unit id="org.eclipse.acceleo.feature.group" version="3.5.0.201401281458"/>
-<repository location="http://download.eclipse.org/releases/luna"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="com.google.guava" version="12.0.0.v201212092141"/>
-<unit id="com.google.guava.source" version="12.0.0.v201212092141"/>
-<unit id="org.junit" version="4.11.0.v201303080030"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20140116105218/repository"/>
-</location>
-</locations>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Luna SDK" sequenceNumber="1400588072">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.feature.group" version="3.0.0.201405061412"/>
+      <unit id="org.eclipse.acceleo.feature.group" version="3.5.0.201405061315"/>
+      <unit id="org.eclipse.sdk.ide" version="4.4.0.I20140501-0200"/>
+      <unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="2.1.0.v20140325-2210"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.10.0.v20140428-0403"/>
+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.8.0.201405051603"/>
+      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.8.0.201405051541"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.0.0.201405061412"/>
+      <unit id="org.eclipse.jdt.feature.group" version="3.10.0.v20140501-0200"/>
+      <unit id="org.eclipse.emf.cdo.sdk.feature.group" version="4.3.0.v20140312-0617"/>
+      <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.12.0.v20140328-2338"/>
+      <repository location="http://download.eclipse.org/releases/luna"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+      <repository location="http://download.eclipse.org/cbi/updates/license"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.google.guava" version="11.0.2.v201303041551"/>
+      <unit id="com.google.guava.source" version="11.0.2.v201303041551"/>
+      <unit id="org.junit" version="4.11.0.v201303080030"/>
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/"/>
+    </location>
+  </locations>
 </target>

diff --git a/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/luna-sdk.targetplatform b/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/luna-sdk.targetplatform
index 1fc0ba2..0dcd83d 100644
--- a/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/luna-sdk.targetplatform
+++ b/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/luna-sdk.targetplatform

@@ -1,25 +1,31 @@
 target "Luna SDK"
 
+with source, requirements
+
 // Eclipse plugins dependencies
 location "http://download.eclipse.org/releases/luna" {
-	with source, requirements
+	org.eclipse.emf.compare.feature.group;version=[3.0.0,4.0.0)	
+    org.eclipse.acceleo.feature.group;version=[3.5.0,4.0.0)
 	org.eclipse.sdk.ide	
 	org.eclipse.mylyn.wikitext_feature.feature.group	
 	org.eclipse.emf.sdk.feature.group
 	org.eclipse.emf.transaction.sdk.feature.group
 	org.eclipse.emf.validation.sdk.feature.group
-	org.eclipse.emf.compare.feature.group
 	org.eclipse.emf.compare.ide.ui.feature.group
 	org.eclipse.jdt.feature.group
 	org.eclipse.emf.cdo.sdk.feature.group
 	org.eclipse.mylyn.ide_feature.feature.group
-	org.eclipse.acceleo.feature.group
+}
+
+// licence
+location "http://download.eclipse.org/cbi/updates/license" {
+	org.eclipse.license.feature.group
 }
 
 // Orbit dependencies
-location "http://download.eclipse.org/tools/orbit/downloads/drops/S20140116105218/repository" {
-	with source, requirements	
-	com.google.guava;version="[10.0.0,16.0.0)"
+location "http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/" {
+	com.google.guava;version=[11.0.0,12.0.0)
+	com.google.guava.^source;version=[11.0.0,12.0.0)
 	org.junit
 }
 

diff --git a/tests/org.eclipse.mylyn.docs.intent.client.ui.test/META-INF/MANIFEST.MF b/tests/org.eclipse.mylyn.docs.intent.client.ui.test/META-INF/MANIFEST.MF
index f44dca7..9313f4f 100644
--- a/tests/org.eclipse.mylyn.docs.intent.client.ui.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.mylyn.docs.intent.client.ui.test/META-INF/MANIFEST.MF

@@ -24,7 +24,7 @@
  org.eclipse.core.resources;bundle-version="3.7.100",
  org.junit;bundle-version="4.8.1",
  org.eclipse.jface.text;bundle-version="3.7.0",
- com.google.guava;bundle-version="[12.0.0,13.0.0)",
+ com.google.guava;bundle-version="[11.0.0,15.0.0)",
  org.eclipse.emf.compare;bundle-version="3.0.0",
  org.eclipse.jdt.core,
  org.eclipse.emf.ecore.editor,

diff --git a/tests/org.eclipse.mylyn.docs.intent.collab.test/META-INF/MANIFEST.MF b/tests/org.eclipse.mylyn.docs.intent.collab.test/META-INF/MANIFEST.MF
index b0a9cf6..27cad69 100644
--- a/tests/org.eclipse.mylyn.docs.intent.collab.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.mylyn.docs.intent.collab.test/META-INF/MANIFEST.MF

@@ -17,5 +17,5 @@
  org.eclipse.core.resources;bundle-version="3.6.0",
  org.eclipse.mylyn.docs.intent.collab.ide,
  org.eclipse.mylyn.docs.intent.client.ui.ide;bundle-version="0.7.0",
- com.google.guava;bundle-version="[12.0.0,13.0.0)"
+ com.google.guava;bundle-version="[11.0.0,15.0.0)"
 Bundle-ActivationPolicy: lazy

diff --git a/tests/org.eclipse.mylyn.docs.intent.compare.test/META-INF/MANIFEST.MF b/tests/org.eclipse.mylyn.docs.intent.compare.test/META-INF/MANIFEST.MF
index 4c37ebb..530664d 100644
--- a/tests/org.eclipse.mylyn.docs.intent.compare.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.mylyn.docs.intent.compare.test/META-INF/MANIFEST.MF

@@ -10,7 +10,7 @@
  org.eclipse.mylyn.docs.intent.core;bundle-version="0.7.0",
  org.eclipse.mylyn.docs.intent.parser;bundle-version="0.7.0",
  org.eclipse.emf.compare;bundle-version="2.0.0",
- com.google.guava;bundle-version="[12.0.0,13.0.0)",
+ com.google.guava;bundle-version="[11.0.0,15.0.0)",
  org.eclipse.mylyn.docs.intent.compare;bundle-version="0.7.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5