TEIIDDES-1734: Migrate to new locus update site

* Migrate plugins to depend on the new JBT locus update site
Teiid-Designer · May 23, 2013 · 7b2c152 · 7b2c152 · hokuda · Jul 31, 2013
1 parent 80305fa
commit 7b2c152
Show file tree

Hide file tree

Showing 30 changed files with 70 additions and 58 deletions.
diff --git a/features/org.teiid.designer.feature/feature.xml b/features/org.teiid.designer.feature/feature.xml
@@ -26,18 +26,6 @@
       %license
    </license>
 
-   <includes
-         id="org.jbosstools.locus.sf.saxon.feature"
-         version="9.2.1"/>
-
-   <includes
-         id="org.jbosstools.locus.apache.poi.feature"
-         version="2.5.1"/>
-
-   <includes
-         id="org.jbosstools.locus.jcip.annotations.feature"
-         version="1.0.0"/>
-
    <requires>
       <import plugin="org.eclipse.ui.cheatsheets" version="3.4.200" match="compatible"/>
       <import plugin="org.eclipse.ui.ide" version="3.8.0" match="compatible"/>
@@ -84,11 +72,11 @@
       <import plugin="org.eclipse.ui.navigator.resources" version="3.4.400" match="compatible"/>
       <import plugin="org.teiid.designer.spi" version="8.1.0" match="compatible"/>
       <import plugin="org.apache.xerces"/>
-      <import plugin="org.jbosstools.locus.sf.saxon" version="9.2.1" match="compatible"/>
+      <import plugin="org.jboss.tools.locus.sf.saxon" version="9.2.1" match="compatible"/>
       <import plugin="org.eclipse.emf.ecore" version="2.8.0" match="compatible"/>
       <import plugin="org.eclipse.emf.edit" version="2.8.0" match="compatible"/>
       <import plugin="org.eclipse.emf.common" version="2.8.0" match="compatible"/>
-      <import plugin="org.jbosstools.locus.apache.poi" version="2.5.1" match="compatible"/>
+      <import plugin="org.jboss.tools.locus.apache.poi" version="2.5.1" match="compatible"/>
       <import plugin="org.eclipse.datatools.connectivity" version="1.2.5" match="compatible"/>
       <import plugin="org.teiid.designer.compare.ui" version="8.1.0" match="compatible"/>
       <import plugin="org.teiid.designer.ui" version="8.1.0" match="compatible"/>
@@ -130,7 +118,7 @@
       <import plugin="org.teiid.designer.modelgenerator.salesforce" version="8.1.0" match="compatible"/>
       <import plugin="org.eclipse.datatools.help" version="1.5.0" match="compatible"/>
       <import plugin="org.eclipse.osgi" version="3.8.0" match="compatible"/>
-      <import plugin="org.jbosstools.locus.jcip.annotations" version="1.0.0" match="compatible"/>
+      <import plugin="org.jboss.tools.locus.jcip.annotations" version="1.0.0" match="compatible"/>
       <import plugin="org.teiid.designer.roles" version="8.1.0" match="compatible"/>
       <import plugin="org.teiid.designer.vdb" version="8.1.0" match="compatible"/>
       <import plugin="org.teiid.designer.roles.ui" version="8.1.0" match="compatible"/>
@@ -602,4 +590,25 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.jboss.tools.locus.apache.poi"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.jboss.tools.locus.jcip.annotations"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.jboss.tools.locus.sf.saxon"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/features/org.teiid.designer.runtime.feature/feature.xml b/features/org.teiid.designer.runtime.feature/feature.xml
@@ -123,7 +123,7 @@ Including: Connection management, VDB creation and management and Data Preview/V
       <import feature="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature" version="1.7.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.datatools.sqldevtools.sqlbuilder.feature" version="1.7.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.datatools.sqltools.doc.user" version="1.7.0" match="greaterOrEqual"/>
-      <import plugin="org.jbosstools.locus.jcip.annotations" version="1.0.0" match="compatible"/>
+      <import plugin="org.jboss.tools.locus.jcip.annotations" version="1.0.0" match="compatible"/>
       <import plugin="org.teiid.designer.spi" version="8.1.0" match="compatible"/>
       <import plugin="org.jboss.ide.eclipse.as.ui" version="2.4.0" match="compatible"/>
    </requires>

diff --git a/features/org.teiid.designer.teiid.client.feature/feature.xml b/features/org.teiid.designer.teiid.client.feature/feature.xml
@@ -19,7 +19,7 @@
 
    <requires>
       <import plugin="org.jdom" version="1.1.1" match="compatible"/>
-      <import plugin="org.jbosstools.locus.sf.saxon" version="9.2.1" match="compatible"/>
+      <import plugin="org.jboss.tools.locus.sf.saxon" version="9.2.1" match="compatible"/>
       <import plugin="org.hamcrest.core" version="1.1.0" match="compatible"/>
       <import plugin="org.teiid.designer.spi" version="8.1.0" match="compatible"/>
       <import plugin="org.eclipse.core.runtime" version="3.8.0" match="compatible"/>

diff --git a/features/org.teiid.designer.test.feature/feature.xml b/features/org.teiid.designer.test.feature/feature.xml
@@ -19,12 +19,8 @@
       %license
    </license>
 
-   <includes
-         id="org.jbosstools.locus.mockito.feature"
-         version="0.0.0"/>
-
    <requires>
-      <import plugin="org.jbosstools.locus.mockito" version="1.9.5" match="compatible"/>
+      <import plugin="org.jboss.tools.locus.mockito" version="1.9.5" match="compatible"/>
       <import plugin="org.hamcrest" version="1.1.0" match="compatible"/>
       <import plugin="org.hamcrest.core" version="1.1.0" match="compatible"/>
       <import plugin="org.hamcrest.integration" version="1.1.0" match="compatible"/>
@@ -59,7 +55,7 @@
       <import plugin="org.teiid.7.7.x" version="8.1.0" match="compatible"/>
       <import plugin="org.teiid.designer.query.ui"/>
       <import plugin="org.teiid.designer.schema.tools"/>
-      <import plugin="org.jbosstools.locus.mockito" version="1.9.5" match="greaterOrEqual"/>
+      <import plugin="org.jboss.tools.locus.mockito" version="1.9.5" match="greaterOrEqual"/>
       <import plugin="org.teiid.7.7.x" version="8.1.0" match="greaterOrEqual"/>
       <import plugin="org.teiid.8.3.x" version="8.1.0" match="greaterOrEqual"/>
       <import plugin="org.teiid.8.4.x" version="8.1.0" match="greaterOrEqual"/>
@@ -364,4 +360,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.jboss.tools.locus.mockito"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/plugins/org.teiid.core.designer/META-INF/MANIFEST.MF b/plugins/org.teiid.core.designer/META-INF/MANIFEST.MF
@@ -17,6 +17,6 @@ Export-Package: org.teiid.core.designer,
  org.teiid.core.designer.util,
  org.teiid.core.designer.xml
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.jbosstools.locus.sf.saxon;bundle-version="[9.2.1,10.0.0)"
+ org.jboss.tools.locus.sf.saxon;bundle-version="[9.2.1,10.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.teiid.designer.core.xslt/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.core.xslt/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.teiid.designer.core.xslt.CoreXsltPlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
 Require-Bundle: org.teiid.core.designer;bundle-version="[8.1.0,9.0.0)",
- org.jbosstools.locus.sf.saxon;bundle-version="[9.2.1,10.0.0)",
+ org.jboss.tools.locus.sf.saxon;bundle-version="[9.2.1,10.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.jdom;bundle-version="[1.1.1,2.0.0)"
 Bundle-ActivationPolicy: lazy

diff --git a/plugins/org.teiid.designer.dqp.ui/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.dqp.ui/META-INF/MANIFEST.MF
@@ -61,7 +61,7 @@ Require-Bundle: org.eclipse.ui.views;bundle-version="[3.6.100,4.0.0)",
  org.teiid.designer.datatools.ui;bundle-version="[8.1.0,9.0.0)",
  org.teiid.designer.datatools;bundle-version="[8.1.0,9.0.0)",
  org.eclipse.datatools.sqltools.sqleditor;bundle-version="[1.0.2,2.0.0)",
- org.jbosstools.locus.jcip.annotations;bundle-version="[1.0.0,2.0.0)",
+ org.jboss.tools.locus.jcip.annotations;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.datatools.sqltools.result.ui;bundle-version="[1.1.2,2.0.0)",
  org.teiid.datatools.connectivity.ui;bundle-version="[8.1.0,9.0.0)",
  org.teiid.designer.sdt;bundle-version="[8.1.0,9.0.0)",

diff --git a/plugins/org.teiid.designer.dqp/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.dqp/META-INF/MANIFEST.MF
@@ -27,7 +27,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.teiid.designer.legacy;bundle-version="[8.1.0,9.0.0)",
  org.teiid.designer.vdb;bundle-version="[8.1.0,9.0.0)",
  org.eclipse.datatools.connectivity;bundle-version="[1.2.5,2.0.0)",
- org.jbosstools.locus.jcip.annotations;bundle-version="[1.0.0,2.0.0)",
+ org.jboss.tools.locus.jcip.annotations;bundle-version="[1.0.0,2.0.0)",
  org.teiid.designer.datatools;bundle-version="[8.1.0,9.0.0)",
  org.teiid.designer.metamodels.relational;bundle-version="[8.1.0,9.0.0)",
  org.teiid.designer.metamodels.webservice;bundle-version="[8.1.0,9.0.0)",

diff --git a/plugins/org.teiid.designer.jdbc/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.jdbc/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.8.0,3.0.0)",
  org.teiid.designer.core;bundle-version="[8.1.0,9.0.0)",
- org.jbosstools.locus.apache.poi;bundle-version="[2.5.1,3.0.0)",
+ org.jboss.tools.locus.apache.poi;bundle-version="[2.5.1,3.0.0)",
  org.teiid.core.designer;bundle-version="[8.1.0,9.0.0)",
  org.eclipse.datatools.connectivity;bundle-version="[1.2.5,2.0.0)"
 Bundle-ActivationPolicy: lazy

diff --git a/plugins/org.teiid.designer.vdb/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.vdb/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.teiid.designer.legacy;bundle-version="[8.1.0,9.0.0)",
  org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.xsd;bundle-version="[2.8.0,3.0.0)",
- org.jbosstools.locus.jcip.annotations;bundle-version="[1.0.0,2.0.0)",
+ org.jboss.tools.locus.jcip.annotations;bundle-version="[1.0.0,2.0.0)",
  org.teiid.designer.datatools;bundle-version="[8.1.0,9.0.0)",
  org.teiid.designer.roles;bundle-version="[8.1.0,9.0.0)",
  org.teiid.designer.metamodels.function;bundle-version="8.0.0",

diff --git a/plugins/org.teiid.designer.webservice.ui/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.webservice.ui/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Require-Bundle: org.eclipse.ui.cheatsheets;bundle-version="[3.4.200,4.0.0)",
  org.teiid.designer.transformation.ui;bundle-version="[8.1.0,9.0.0)",
  org.eclipse.gef;bundle-version="[3.8.0,4.0.0)",
  org.teiid.designer.metamodels.wsdl;bundle-version="[8.1.0,9.0.0)",
- org.jbosstools.locus.sf.saxon;bundle-version="[9.2.1,10.0.0)",
+ org.jboss.tools.locus.sf.saxon;bundle-version="[9.2.1,10.0.0)",
  org.eclipse.wst.wsdl.validation;bundle-version="[1.1.600,2.0.0)",
  org.teiid.designer.core;bundle-version="[8.1.0,9.0.0)",
  org.teiid.core.designer;bundle-version="[8.1.0,9.0.0)",

diff --git a/plugins/teiid/org.teiid.7.7.x b/plugins/teiid/org.teiid.7.7.x
diff --git a/plugins/teiid/org.teiid.8.3.x b/plugins/teiid/org.teiid.8.3.x
diff --git a/plugins/teiid/org.teiid.8.4.x b/plugins/teiid/org.teiid.8.4.x
diff --git a/target-platform/locus.target b/target-platform/locus.target
@@ -4,11 +4,11 @@
 <target name="locus" sequenceNumber="4">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="http://download.jboss.org/teiid/designer/updates/locus"/>
-<unit id="org.jbosstools.locus.apache.poi.feature.feature.group" version="2.5.1.Final-v20130301-1425"/>
-<unit id="org.jbosstools.locus.jcip.annotations.feature.feature.group" version="1.0.0.Final-v20130301-1425"/>
-<unit id="org.jbosstools.locus.mockito.feature.feature.group" version="1.9.5.Final-v20130301-1425"/>
-<unit id="org.jbosstools.locus.sf.saxon.feature.feature.group" version="9.2.1.Final-v20130301-1425"/>
+<repository location="http://download.jboss.org/jbosstools/updates/integration/kepler/core/locus/0.0.1.v20130507-2028-B7"/>
+  <unit id="org.jboss.tools.locus.apache.poi" version="2.5.1.Final-v20130507-2028-B7"/>
+  <unit id="org.jboss.tools.locus.jcip.annotations" version="1.0.0.Final-v20130507-2028-B7"/>
+  <unit id="org.jboss.tools.locus.mockito" version="1.9.5.Final_patched_TEIIDDES-1681-v20130507-2028-B7"/>
+  <unit id="org.jboss.tools.locus.sf.saxon" version="9.2.1.5j-Final-v20130507-2028-B7"/>
 </location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

diff --git a/target-platform/teiid-designer.target b/target-platform/teiid-designer.target
@@ -2,11 +2,11 @@
 <target name="locus" sequenceNumber="4">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="http://download.jboss.org/teiid/designer/updates/locus"/>
-<unit id="org.jbosstools.locus.apache.poi.feature.feature.group" version="2.5.1.Final-v20130301-1425"/>
-<unit id="org.jbosstools.locus.jcip.annotations.feature.feature.group" version="1.0.0.Final-v20130301-1425"/>
-<unit id="org.jbosstools.locus.mockito.feature.feature.group" version="1.9.5.Final-v20130301-1425"/>
-<unit id="org.jbosstools.locus.sf.saxon.feature.feature.group" version="9.2.1.Final-v20130301-1425"/>
+<repository location="http://download.jboss.org/jbosstools/updates/integration/kepler/core/locus/0.0.1.v20130507-2028-B7"/>
+  <unit id="org.jboss.tools.locus.apache.poi" version="2.5.1.Final-v20130507-2028-B7"/>
+  <unit id="org.jboss.tools.locus.jcip.annotations" version="1.0.0.Final-v20130507-2028-B7"/>
+  <unit id="org.jboss.tools.locus.mockito" version="1.9.5.Final_patched_TEIIDDES-1681-v20130507-2028-B7"/>
+  <unit id="org.jboss.tools.locus.sf.saxon" version="9.2.1.5j-Final-v20130507-2028-B7"/>
 </location>
 
 
@@ -592,4 +592,4 @@
 
   </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
+</target>
diff --git a/tests/org.teiid.7.7.x.test/META-INF/MANIFEST.MF b/tests/org.teiid.7.7.x.test/META-INF/MANIFEST.MF
@@ -13,4 +13,4 @@ Require-Bundle: org.hamcrest;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.library;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.text;bundle-version="[1.1.0,2.0.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.jbosstools.locus.mockito;bundle-version="1.9.5"
+ org.jboss.tools.locus.mockito;bundle-version="1.9.5"
diff --git a/tests/org.teiid.8.3.x.test/META-INF/MANIFEST.MF b/tests/org.teiid.8.3.x.test/META-INF/MANIFEST.MF
@@ -13,4 +13,4 @@ Require-Bundle: org.hamcrest;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.library;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.text;bundle-version="[1.1.0,2.0.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.jbosstools.locus.mockito;bundle-version="[1.9.5,2.0.0)"
+ org.jboss.tools.locus.mockito;bundle-version="[1.9.5,2.0.0)"
diff --git a/tests/org.teiid.8.4.x.test/META-INF/MANIFEST.MF b/tests/org.teiid.8.4.x.test/META-INF/MANIFEST.MF
@@ -13,4 +13,4 @@ Require-Bundle: org.hamcrest;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.library;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.text;bundle-version="[1.1.0,2.0.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.jbosstools.locus.mockito;bundle-version="[1.9.5,2.0.0)"
+ org.jboss.tools.locus.mockito;bundle-version="[1.9.5,2.0.0)"
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.2.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.jbosstools.locus.mockito;bundle-version="[1.9.5,2.0.0)",
+Require-Bundle: org.jboss.tools.locus.mockito;bundle-version="[1.9.5,2.0.0)",
  org.hamcrest;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.integration;bundle-version="[1.1.0,2.0.0)",

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.2.0.qualifier
 Bundle-Vendor: %Bundle-Vendor.0
 Fragment-Host: org.teiid.core.designer
 Bundle-Localization: plugin
-Require-Bundle: org.jbosstools.locus.mockito;bundle-version="[1.9.5,2.0.0)",
+Require-Bundle: org.jboss.tools.locus.mockito;bundle-version="[1.9.5,2.0.0)",
  org.hamcrest;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.integration;bundle-version="[1.1.0,2.0.0)",

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;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.mapping;bundle-version="[2.7.0,3.0.0)",
  org.teiid.designer.core;bundle-version="[8.1.0,9.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.jbosstools.locus.mockito;bundle-version="[1.9.5,2.0.0)",
+ org.jboss.tools.locus.mockito;bundle-version="[1.9.5,2.0.0)",
  org.hamcrest;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.integration;bundle-version="[1.1.0,2.0.0)",

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.junit;bundle-version="[4.11.0,5.0.0)",
- org.jbosstools.locus.mockito;bundle-version="[1.9.5,2.0.0)",
+ org.jboss.tools.locus.mockito;bundle-version="[1.9.5,2.0.0)",
  org.hamcrest;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.integration;bundle-version="[1.1.0,2.0.0)",

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,7 +8,7 @@ Fragment-Host: org.teiid.designer.ddl.importer
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.teiid.core.designer.test.framework;bundle-version="[8.1.0,9.0.0)",
- org.jbosstools.locus.mockito;bundle-version="[1.9.5,2.0.0)",
+ org.jboss.tools.locus.mockito;bundle-version="[1.9.5,2.0.0)",
  org.hamcrest;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.integration;bundle-version="[1.1.0,2.0.0)",

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.junit;bundle-version="[4.11.0,5.0.0)",
- org.jbosstools.locus.mockito;bundle-version="[1.9.5,2.0.0)",
+ org.jboss.tools.locus.mockito;bundle-version="[1.9.5,2.0.0)",
  org.hamcrest;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.integration;bundle-version="[1.1.0,2.0.0)",

diff --git a/tests/org.teiid.designer.query.ui.test/META-INF/MANIFEST.MF b/tests/org.teiid.designer.query.ui.test/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.teiid.8.4.x;bundle-version="[8.2.0,9.0.0)",
  org.teiid.8.3.x;bundle-version="[8.1.0,9.0.0)",
  org.teiid.7.7.x;bundle-version="[8.1.0,9.0.0)",
- org.jbosstools.locus.mockito;bundle-version="[1.9.5,2.0.0)",
+ org.jboss.tools.locus.mockito;bundle-version="[1.9.5,2.0.0)",
  org.hamcrest;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.integration;bundle-version="[1.1.0,2.0.0)",

diff --git a/tests/org.teiid.designer.schema.tools.test/META-INF/MANIFEST.MF b/tests/org.teiid.designer.schema.tools.test/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.teiid.designer.sdt;bundle-version="[8.1.0,9.0.0)",
  org.teiid.8.3.x;bundle-version="[8.1.0,9.0.0)",
  org.teiid.7.7.x;bundle-version="[8.1.0,9.0.0)",
- org.jbosstools.locus.mockito;bundle-version="[1.9.5,2.0.0)",
+ org.jboss.tools.locus.mockito;bundle-version="[1.9.5,2.0.0)",
  org.hamcrest;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.integration;bundle-version="[1.1.0,2.0.0)",

diff --git a/tests/org.teiid.designer.test/META-INF/MANIFEST.MF b/tests/org.teiid.designer.test/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.103.0,4.0.0)",
  org.teiid.designer.ui.common;bundle-version="[8.1.0,9.0.0)",
  org.teiid.designer.core;bundle-version="[8.1.0,9.0.0)",
  org.teiid.designer.sdt;bundle-version="[8.1.0,9.0.0)",
- org.jbosstools.locus.mockito;bundle-version="1.9.5"
+ org.jboss.tools.locus.mockito;bundle-version="1.9.5"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %Bundle-Vendor
diff --git a/tests/org.teiid.designer.transformation.test/META-INF/MANIFEST.MF b/tests/org.teiid.designer.transformation.test/META-INF/MANIFEST.MF
@@ -13,6 +13,6 @@ Bundle-Localization: plugin
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.teiid.core.designer.test.framework;bundle-version="[8.1.0,9.0.0)",
  org.teiid.designer.core.test.framework;bundle-version="[8.1.0,9.0.0)",
- org.jbosstools.locus.mockito;bundle-version="1.9.5",
+ org.jboss.tools.locus.mockito;bundle-version="1.9.5",
  org.teiid.7.7.x;bundle-version="8.1.0",
  org.teiid.8.3.x;bundle-version="8.1.0"
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.2.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %Bundle-Vendor
 Fragment-Host: org.teiid.designer.vdb
-Require-Bundle: org.jbosstools.locus.mockito;bundle-version="[1.9.5,2.0.0)",
+Require-Bundle: org.jboss.tools.locus.mockito;bundle-version="[1.9.5,2.0.0)",
  org.hamcrest;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.integration;bundle-version="[1.1.0,2.0.0)",