Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2014-12-23 19:33:46 -0500
committerMatthias Sohn2014-12-23 19:34:01 -0500
commitee9cbeaba38276913404c56d4cdeda91300d3b0b (patch)
treeaae42a6c343846d8332acfb1c1010e8fb0726959 /org.eclipse.mylyn.github.tests
parent0b2d4e9e0767d5d7b76196a0f16b711a776a8292 (diff)
parentfe1f23c2717d71dad5fff8b187cac7e3363162ad (diff)
downloadegit-github-ee9cbeaba38276913404c56d4cdeda91300d3b0b.tar.gz
egit-github-ee9cbeaba38276913404c56d4cdeda91300d3b0b.tar.xz
egit-github-ee9cbeaba38276913404c56d4cdeda91300d3b0b.zip
Merge branch 'stable-3.6'
* stable-3.6: Prepare 3.6.1-SNAPSHOT builds EGit Mylyn Github Connector v3.6.0.201412230720-r Change-Id: I30c365de3b7c97983639f701188b713100556d3c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.mylyn.github.tests')
-rw-r--r--org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF6
-rw-r--r--org.eclipse.mylyn.github.tests/pom.xml2
2 files changed, 4 insertions, 4 deletions
diff --git a/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF
index 8173b055..1b3007d0 100644
--- a/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Eclipse EGit Mylyn GitHub Tests
Bundle-SymbolicName: org.eclipse.mylyn.github.tests
-Bundle-Version: 3.6.0.qualifier
+Bundle-Version: 3.6.1.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
org.eclipse.mylyn.tasks.ui;bundle-version="[3.2.0,4.0.0)",
@@ -12,8 +12,8 @@ Require-Bundle: org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
org.hamcrest;bundle-version="[1.1.0,2.0.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)"
Bundle-Vendor: Eclipse EGit
-Import-Package: org.eclipse.mylyn.internal.github.core;version="[3.6.0,3.7.0)",
- org.eclipse.mylyn.internal.github.ui.issue;version="[3.6.0,3.7.0)",
+Import-Package: org.eclipse.mylyn.internal.github.core;version="[3.6.1,3.7.0)",
+ org.eclipse.mylyn.internal.github.ui.issue;version="[3.6.1,3.7.0)",
org.mockito;version="[1.8.4,2.0.0)",
org.mockito.runners;version="[1.8.4,2.0.0)",
org.mockito.stubbing;version="[1.8.4,2.0.0)"
diff --git a/org.eclipse.mylyn.github.tests/pom.xml b/org.eclipse.mylyn.github.tests/pom.xml
index aafd689c..713252e4 100644
--- a/org.eclipse.mylyn.github.tests/pom.xml
+++ b/org.eclipse.mylyn.github.tests/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.mylyn.github</groupId>
<artifactId>github-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.github.tests</artifactId>

Back to the top