diff options
| author | Laurent Goubet | 2017-03-30 14:49:43 +0000 |
|---|---|---|
| committer | Laurent Goubet | 2017-05-11 13:48:36 +0000 |
| commit | 85b8d08d5c0bc6e66d627ec9fdd68d7c79ff06da (patch) | |
| tree | 6b210a8ccc76c1f631340e661ef5511858497026 /plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF | |
| parent | 0b9bb74d1af822dd06a77b66ef5af101ef29af3f (diff) | |
| download | org.eclipse.emf.compare-85b8d08d5c0bc6e66d627ec9fdd68d7c79ff06da.tar.gz org.eclipse.emf.compare-85b8d08d5c0bc6e66d627ec9fdd68d7c79ff06da.tar.xz org.eclipse.emf.compare-85b8d08d5c0bc6e66d627ec9fdd68d7c79ff06da.zip | |
Compatibility with guava 21
- Objects.ToStringHelper has been moved to MoreObjects. We now
reimplement the functionality in order to be compatible with both guava
15 and guava 21
- com.google.common.base.Predicate now extends
java.util.Function.Predicate. As a result static imports of "and" and
"or" from Predicates are shadowed by java.util.function.Predicate
variants, preventing the statics from being called unless explicitely
qualified.
Change-Id: Ie33d5eedd9e1a6dbea8f4af2db9aa36ec8567cf5
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF index 35d02dae0..6068226df 100644 --- a/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF @@ -55,7 +55,7 @@ Export-Package: org.eclipse.emf.compare.tests, org.eclipse.emf.compare.tests.scope, org.eclipse.emf.compare.tests.suite, org.eclipse.emf.compare.tests.unit -Import-Package: com.google.common.base;version="[12.0.0,16.0.0)", - com.google.common.cache;version="[12.0.0,16.0.0)", - com.google.common.collect;version="[12.0.0,16.0.0)" +Import-Package: com.google.common.base;version="[15.0.0,22.0.0)", + com.google.common.cache;version="[15.0.0,22.0.0)", + com.google.common.collect;version="[15.0.0,22.0.0)" Bundle-ActivationPolicy: lazy |