Merge branch 'e_3_7_m_3_5_x' of ssh://sdubois@git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.reviews.git into versionsIntegration
diff --git a/pom.xml b/pom.xml
index 1c29c10..6596af0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,18 @@
         <platform-version>[3.7.0,3.8.0)</platform-version>
       </properties>
     </profile>
+    <profile>
+      <id>release</id>
+      <activation>
+		<property>
+          <name>env.TYPE</name>
+          <value>release</value>
+		</property>
+      </activation>
+      <properties>
+		<forceContextQualifier>v${env.TIMESTAMP}</forceContextQualifier>
+	  </properties>
+	</profile>
   </profiles>
 
   <pluginRepositories>
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/META-INF/MANIFEST.MF b/tbr/org.eclipse.mylyn.reviews.tasks.core/META-INF/MANIFEST.MF
index 71f7b40..79d4f86 100644
--- a/tbr/org.eclipse.mylyn.reviews.tasks.core/META-INF/MANIFEST.MF
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@
  org.eclipse.mylyn.reviews.tasks.dsl;bundle-version="0.7.0",
  org.eclipse.mylyn.versions.core;bundle-version="0.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.mylyn.reviews.tasks.core,
+Export-Package: org.eclipse.mylyn.reviews.tasks.core;x-friends:="org.eclipse.mylyn.tasks.ui",
  org.eclipse.mylyn.reviews.tasks.core.internal;x-friends:="org.eclipse.mylyn.reviews.tasks.ui"
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/META-INF/MANIFEST.MF b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/META-INF/MANIFEST.MF
index 690e153..29a1812 100644
--- a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/META-INF/MANIFEST.MF
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/META-INF/MANIFEST.MF
@@ -9,6 +9,6 @@
  org.antlr.runtime.tree;version="[3.0.0,3.0.0]",
  org.apache.log4j
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.mylyn.reviews.tasks.dsl,
- org.eclipse.mylyn.reviews.tasks.dsl.internal
+Export-Package: org.eclipse.mylyn.reviews.tasks.dsl;x-friends:="org.eclipse.mylyn.reviews.tasks.ui",
+ org.eclipse.mylyn.reviews.tasks.dsl.internal;x-friends:="org.eclipse.mylyn.reviews.tasks.ui"