relaxed version constraints
diff --git a/org.eclipse.mylyn.incubator-site/site.xml b/org.eclipse.mylyn.incubator-site/site.xml index 6d53bc0..a97e49a 100644 --- a/org.eclipse.mylyn.incubator-site/site.xml +++ b/org.eclipse.mylyn.incubator-site/site.xml
@@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <site> - <description url="http://download.eclipse.org/tools/mylyn/update/weekly/incubator"> + <description url="http://download.eclipse.org/mylyn/incubator"> Mylyn Incubator </description> + <feature url="features/org.eclipse.mylyn.sandbox.serach_0.0.0.jar" id="org.eclipse.mylyn.sandbox.search" version="0.0.0"> + <category name="Incubator"/> + </feature> <feature url="features/org.eclipse.mylyn.sandbox.ui_feature_0.0.0.jar" id="org.eclipse.mylyn.sandbox.ui_feature" version="0.0.0"> <category name="Incubator"/> </feature>
diff --git a/org.eclipse.mylyn.sandbox.dev-feature/feature.xml b/org.eclipse.mylyn.sandbox.dev-feature/feature.xml index 30e6f6c..a7b778f 100644 --- a/org.eclipse.mylyn.sandbox.dev-feature/feature.xml +++ b/org.eclipse.mylyn.sandbox.dev-feature/feature.xml
@@ -29,7 +29,7 @@ </license> <requires> - <import feature="org.eclipse.mylyn.context_feature" version="3.5.0" match="equivalent"/> + <import feature="org.eclipse.mylyn.context_feature" version="3.5.0" match="greaterOrEqual"/> </requires> <plugin
diff --git a/org.eclipse.mylyn.sandbox.search-feature/feature.xml b/org.eclipse.mylyn.sandbox.search-feature/feature.xml index 46768f2..a618513 100644 --- a/org.eclipse.mylyn.sandbox.search-feature/feature.xml +++ b/org.eclipse.mylyn.sandbox.search-feature/feature.xml
@@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <feature - id="org.eclipse.mylyn.sandbox.search_feature" + id="org.eclipse.mylyn.sandbox.search" label="%featureName" version="3.6.0.qualifier" provider-name="%providerName" - plugin="org.eclipse.mylyn.sandbox.search.ui" + plugin="org.eclipse.mylyn" os="win32" arch="x86,x86_64"> @@ -20,7 +20,6 @@ %license </license> - <plugin id="org.eclipse.mylyn.sandbox.search.ui" download-size="0"
diff --git a/org.eclipse.mylyn.sandbox.search-feature/pom.xml b/org.eclipse.mylyn.sandbox.search-feature/pom.xml index 44bf9fa..521b032 100644 --- a/org.eclipse.mylyn.sandbox.search-feature/pom.xml +++ b/org.eclipse.mylyn.sandbox.search-feature/pom.xml
@@ -13,4 +13,22 @@ <artifactId>org.eclipse.mylyn.sandbox.search_feature</artifactId> <version>3.6.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <resolver>p2</resolver> + <environments> + <environment> + <os>win32</os> + <arch>x86</arch> + </environment> + </environments> + </configuration> + </plugin> + </plugins> + </build> </project>
diff --git a/org.eclipse.mylyn.sandbox.search.ui/pom.xml b/org.eclipse.mylyn.sandbox.search.ui/pom.xml index c418705..4a7ea2e 100644 --- a/org.eclipse.mylyn.sandbox.search.ui/pom.xml +++ b/org.eclipse.mylyn.sandbox.search.ui/pom.xml
@@ -17,6 +17,20 @@ <plugins> <plugin> <groupId>org.sonatype.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <resolver>p2</resolver> + <environments> + <environment> + <os>win32</os> + <arch>x86</arch> + </environment> + </environments> + </configuration> + </plugin> + <plugin> + <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-source-plugin</artifactId> </plugin> <plugin>
diff --git a/org.eclipse.mylyn.sandbox.ui-feature/feature.xml b/org.eclipse.mylyn.sandbox.ui-feature/feature.xml index 8b75073..7d92b24 100644 --- a/org.eclipse.mylyn.sandbox.ui-feature/feature.xml +++ b/org.eclipse.mylyn.sandbox.ui-feature/feature.xml
@@ -29,9 +29,9 @@ </license> <requires> - <import feature="org.eclipse.mylyn.context_feature" version="3.5.0" match="equivalent"/> - <import feature="org.eclipse.mylyn.pde_feature" version="3.5.0" match="equivalent"/> - <import feature="org.eclipse.mylyn.java_feature" version="3.5.0" match="equivalent"/> + <import feature="org.eclipse.mylyn.context_feature" version="3.5.0" match="greaterOrEqual"/> + <import feature="org.eclipse.mylyn.pde_feature" version="3.5.0" match="greaterOrEqual"/> + <import feature="org.eclipse.mylyn.java_feature" version="3.5.0" match="greaterOrEqual"/> </requires> <plugin
diff --git a/org.eclipse.mylyn.trac.wiki-feature/feature.xml b/org.eclipse.mylyn.trac.wiki-feature/feature.xml index f4aae94..4c67301 100644 --- a/org.eclipse.mylyn.trac.wiki-feature/feature.xml +++ b/org.eclipse.mylyn.trac.wiki-feature/feature.xml
@@ -29,7 +29,7 @@ </license> <requires> - <import feature="org.eclipse.mylyn.trac_feature" version="3.5.0" match="equivalent"/> + <import feature="org.eclipse.mylyn.trac_feature" version="3.5.0" match="greaterOrEqual"/> </requires> <plugin
diff --git a/org.eclipse.mylyn.web.tasks-feature/feature.xml b/org.eclipse.mylyn.web.tasks-feature/feature.xml index 7492d99..0713196 100644 --- a/org.eclipse.mylyn.web.tasks-feature/feature.xml +++ b/org.eclipse.mylyn.web.tasks-feature/feature.xml
@@ -29,7 +29,7 @@ </license> <requires> - <import feature="org.eclipse.mylyn_feature" version="3.5.0" match="equivalent"/> + <import feature="org.eclipse.mylyn_feature" version="3.5.0" match="greaterOrEqual"/> <import plugin="org.eclipse.mylyn.commons.core" version="3.2.0" match="compatible"/> <import plugin="org.eclipse.mylyn.commons.net" version="3.2.0" match="compatible"/> <import plugin="org.eclipse.mylyn.commons.ui" version="3.2.0" match="compatible"/>
diff --git a/org.eclipse.mylyn.wikitext.sandbox-feature/feature.xml b/org.eclipse.mylyn.wikitext.sandbox-feature/feature.xml index fbe9ed8..5f12125 100644 --- a/org.eclipse.mylyn.wikitext.sandbox-feature/feature.xml +++ b/org.eclipse.mylyn.wikitext.sandbox-feature/feature.xml
@@ -28,7 +28,7 @@ </license> <requires> - <import feature="org.eclipse.mylyn.wikitext_feature" version="1.4.0" match="equivalent"/> + <import feature="org.eclipse.mylyn.wikitext_feature" version="1.4.0" match="greaterOrEqual"/> </requires> <plugin
diff --git a/pom.xml b/pom.xml index 1901dcf..03a63fa 100644 --- a/pom.xml +++ b/pom.xml
@@ -9,7 +9,7 @@ <packaging>pom</packaging> <properties> - <tycho-version>0.10.0</tycho-version> + <tycho-version>0.12.0</tycho-version> <mylyn-credentials></mylyn-credentials> <mylyn-keyring>${basedir}/eclipse.keyring</mylyn-keyring> @@ -74,6 +74,8 @@ <module>org.eclipse.mylyn.sandbox.dev</module> <module>org.eclipse.mylyn.sandbox.dev-feature</module> <module>org.eclipse.mylyn.sandbox.tests</module> + <module>org.eclipse.mylyn.sandbox.search.ui</module> + <module>org.eclipse.mylyn.sandbox.search-feature</module> <module>org.eclipse.mylyn.sandbox.ui</module> <module>org.eclipse.mylyn.sandbox.ui-feature</module> <module>org.eclipse.mylyn.trac.wiki</module>