Ensure that tests always use mockito version 1.9 or better

* Possible that jenkins builds find mockito 1.8.4 is maven and decide to use it rather than 1.9.0 resulting in hamcrest plugin loading problems: ** previously initiated loading for a different type with name "org/hamcrest/Matcher"
Teiid-Designer · Jul 17, 2012 · 67647e4 · 67647e4
1 parent af1b19f
commit 67647e4
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/tests/org.teiid.core.designer.test.framework/META-INF/MANIFEST.MF b/tests/org.teiid.core.designer.test.framework/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.teiid.core.designer.test.framework;singleton:=true
 Bundle-Version: 8.0.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.mockito,
+Require-Bundle: org.mockito;bundle-version="1.9.0",
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.teiid.core.designer,

diff --git a/tests/org.teiid.core.designer.test/META-INF/MANIFEST.MF b/tests/org.teiid.core.designer.test/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 8.0.0.qualifier
 Bundle-Vendor: %Bundle-Vendor.0
 Fragment-Host: org.teiid.core.designer
 Bundle-Localization: plugin
-Require-Bundle: org.mockito,
+Require-Bundle: org.mockito;bundle-version="1.9.0",
  org.junit4,
  org.eclipse.core.resources,
  org.teiid.core.designer.test.framework

diff --git a/tests/org.teiid.designer.core.test.framework/META-INF/MANIFEST.MF b/tests/org.teiid.designer.core.test.framework/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.emf.ecore,
  org.eclipse.emf.mapping,
  org.teiid.designer.core,
  org.eclipse.core.runtime,
- org.mockito,
+ org.mockito;bundle-version="1.9.0",
  org.teiid.core.designer.test.framework,
  org.teiid.core.designer,
  teiid_embedded_query,

diff --git a/tests/org.teiid.designer.core.test/META-INF/MANIFEST.MF b/tests/org.teiid.designer.core.test/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Fragment-Host: org.teiid.designer.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Localization: plugin
 Require-Bundle: org.junit4,
- org.mockito,
+ org.mockito;bundle-version="1.9.0",
  org.teiid.core.designer.test.framework,
  org.teiid.designer.sdt,
  org.teiid.designer.core.test.framework

diff --git a/tests/org.teiid.designer.ddl.importer.test/META-INF/MANIFEST.MF b/tests/org.teiid.designer.ddl.importer.test/META-INF/MANIFEST.MF
@@ -8,6 +8,6 @@ Fragment-Host: org.teiid.designer.ddl.importer
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.teiid.core.designer.test.framework,
- org.mockito,
+ org.mockito;bundle-version="1.9.0",
  org.junit4,
  org.teiid.designer.sdt
diff --git a/tests/org.teiid.designer.dqp.test/META-INF/MANIFEST.MF b/tests/org.teiid.designer.dqp.test/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Fragment-Host: org.teiid.designer.dqp
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Localization: plugin
 Require-Bundle: org.junit4,
- org.mockito,
+ org.mockito;bundle-version="1.9.0",
  org.teiid.designer.core.test.framework,
  org.teiid.designer.sdt,
  org.teiid.core.designer.test.framework

diff --git a/tests/org.teiid.designer.vdb.test/META-INF/MANIFEST.MF b/tests/org.teiid.designer.vdb.test/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 8.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %Bundle-Vendor
 Fragment-Host: org.teiid.designer.vdb
-Require-Bundle: org.mockito,
+Require-Bundle: org.mockito;bundle-version="1.9.0",
  org.junit4,
  org.teiid.core.designer.test.framework,
  org.teiid.designer.core.test.framework