Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Dos Santos2014-04-22 21:23:04 +0000
committerLeo Dos Santos2014-05-21 01:00:20 +0000
commit034bcfabeaa4fff6a4ff803ac65d1049e1b3990a (patch)
tree660bc3f1d581088b2290e9dd37d5809e13685db2
parent8b6f24461a00aa4378b1dbaaf771b7dd12cf8c3d (diff)
downloadorg.eclipse.mylyn-034bcfabeaa4fff6a4ff803ac65d1049e1b3990a.tar.gz
org.eclipse.mylyn-034bcfabeaa4fff6a4ff803ac65d1049e1b3990a.tar.xz
org.eclipse.mylyn-034bcfabeaa4fff6a4ff803ac65d1049e1b3990a.zip
433260: build Mylyn with Tycho 0.20
Change-Id: Ibeca6d42161a494739cfa4a00d2edb5cd9cc5034 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=433260 Signed-off-by: Leo Dos Santos <leo.dos.santos@tasktop.com>
-rw-r--r--org.eclipse.mylyn-parent/pom.xml22
-rw-r--r--org.eclipse.mylyn-target/mylyn-e4.4.target8
-rw-r--r--org.eclipse.mylyn-target/mylyn-estaging.target8
3 files changed, 18 insertions, 20 deletions
diff --git a/org.eclipse.mylyn-parent/pom.xml b/org.eclipse.mylyn-parent/pom.xml
index 7f18ba1..f772267 100644
--- a/org.eclipse.mylyn-parent/pom.xml
+++ b/org.eclipse.mylyn-parent/pom.xml
@@ -24,8 +24,8 @@
</prerequisites>
<properties>
- <tycho-version>0.18.1</tycho-version>
- <tycho-extras-version>0.18.1</tycho-extras-version>
+ <tycho-version>0.20.0</tycho-version>
+ <tycho-extras-version>0.20.0</tycho-extras-version>
<mylyn-test-append></mylyn-test-append>
@@ -181,15 +181,6 @@
<dependency-resolution>
<optionalDependencies>ignore</optionalDependencies>
</dependency-resolution>
- <filters>
- <filter>
- <type>eclipse-plugin</type>
- <id>org.eclipse.jdt.annotation</id>
- <restrictTo>
- <versionRange>[1.0,2.0)</versionRange>
- </restrictTo>
- </filter>
- </filters>
<environments>
<environment>
<os>macosx</os>
@@ -251,15 +242,6 @@
<dependency-resolution>
<optionalDependencies>ignore</optionalDependencies>
</dependency-resolution>
- <filters>
- <filter>
- <type>eclipse-plugin</type>
- <id>org.eclipse.jdt.annotation</id>
- <restrictTo>
- <versionRange>[1.0,2.0)</versionRange>
- </restrictTo>
- </filter>
- </filters>
<environments>
<environment>
<os>macosx</os>
diff --git a/org.eclipse.mylyn-target/mylyn-e4.4.target b/org.eclipse.mylyn-target/mylyn-e4.4.target
index 7c6ac00..7dbb850 100644
--- a/org.eclipse.mylyn-target/mylyn-e4.4.target
+++ b/org.eclipse.mylyn-target/mylyn-e4.4.target
@@ -47,16 +47,24 @@
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.cdt.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ecf.core.source.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ecf.core.ssl.source.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ecf.discovery.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ecf.discovery.jmdns.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ecf.filetransfer.source.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ecf.filetransfer.httpclient4.source.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ecf.filetransfer.ssl.source.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.concurrent" version="0.0.0"/>
<unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.ecore.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.common.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.common.ui.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.databinding.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.mylyn-target/mylyn-estaging.target b/org.eclipse.mylyn-target/mylyn-estaging.target
index aa0043d..d67ee94 100644
--- a/org.eclipse.mylyn-target/mylyn-estaging.target
+++ b/org.eclipse.mylyn-target/mylyn-estaging.target
@@ -47,16 +47,24 @@
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.cdt.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ecf.core.source.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ecf.core.ssl.source.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ecf.discovery.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ecf.discovery.jmdns.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ecf.filetransfer.source.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ecf.filetransfer.httpclient4.source.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ecf.filetransfer.ssl.source.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.concurrent" version="0.0.0"/>
<unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.ecore.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.common.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.common.ui.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.databinding.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>

Back to the top