Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsdubois2011-03-16 04:20:54 +0000
committersdubois2011-03-16 04:20:54 +0000
commit0a2312cae5d268f8a11c1d3bf33030aa04cdb80a (patch)
tree15b1a7a693aeee7d97e1b0db6f77c985c7fd5a3b
parentd0c1fb46412aaaa54326ff04fb703328fb22a6b1 (diff)
parenta39e78043ac59c7ceb8761ee106064b7159ba6e8 (diff)
downloadorg.eclipse.mylyn.reviews-versionsIntegration.tar.gz
org.eclipse.mylyn.reviews-versionsIntegration.tar.xz
org.eclipse.mylyn.reviews-versionsIntegration.zip
Merge branch 'e_3_7_m_3_5_x' of ssh://sdubois@git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.reviews.git into versionsIntegrationversionsIntegration
-rw-r--r--pom.xml12
-rw-r--r--tbr/org.eclipse.mylyn.reviews.tasks.core/META-INF/MANIFEST.MF2
-rw-r--r--tbr/org.eclipse.mylyn.reviews.tasks.dsl/META-INF/MANIFEST.MF4
3 files changed, 15 insertions, 3 deletions
diff --git a/pom.xml b/pom.xml
index 1c29c106..6596af09 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 71f7b404..79d4f868 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 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.5.0",
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 690e153e..29a18124 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 @@ Import-Package: org.antlr.runtime;version="[3.0.0,3.0.0]",
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"

Back to the top