From 90b175b5ae10af0d928814b970f2780c688d35aa Mon Sep 17 00:00:00 2001
From: mkersten
Date: Thu, 23 Feb 2006 01:57:41 +0000
Subject: 3.1 merge

---
 org.eclipse.mylyn-feature/feature.xml              | 89 +++-------------------
 .../build.properties                               |  1 +
 org.eclipse.mylyn.bugzilla-feature/feature.xml     | 40 ++++------
 3 files changed, 25 insertions(+), 105 deletions(-)

diff --git a/org.eclipse.mylyn-feature/feature.xml b/org.eclipse.mylyn-feature/feature.xml
index 54c316d59..b74f10580 100644
--- a/org.eclipse.mylyn-feature/feature.xml
+++ b/org.eclipse.mylyn-feature/feature.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.mylar_feature"
-      label="Mylar IDE Integration"
-      version="0.4.8"
+      label="Mylar Task List (Required)"
+      version="0.4.9"
       provider-name="Eclipse.org"
       plugin="org.eclipse.mylar">
 
    <description url="http://eclipse.org/mylar">
-      Mylar UI and support for the Eclipse SDK.
+      Mylar Task List, personal task management facilities, and task repository integration support.
    </description>
 
    <license url="http://www.eclipse.org/legal/epl-v10.html">
@@ -214,106 +214,39 @@ litigation.
    </url>
 
    <requires>
-      <import plugin="org.eclipse.ui" version="3.1.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt.core" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.editors" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jface.text" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.search" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.views" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt.debug.ui"/>
-      <import plugin="org.eclipse.jdt.ui" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.team.cvs.ui"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.jdt.junit"/>
-      <import plugin="org.eclipse.jdt.junit.runtime"/>
-      <import plugin="org.eclipse.pde.junit.runtime"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.pde.ui" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.pde.core" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ant.ui" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.forms" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.update.ui"/>
-      <import plugin="org.eclipse.update.core"/>
       <import plugin="org.eclipse.ui.browser"/>
-      <import plugin="org.eclipse.team.ui"/>
-      <import plugin="org.eclipse.team.cvs.core"/>
-      <import plugin="org.eclipse.team.core"/>
+      <import plugin="org.eclipse.ui.forms" version="0.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
          id="org.eclipse.mylar.doc"
          download-size="0"
          install-size="0"
-         version="0.4.8"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylar.java"
-         download-size="0"
-         install-size="0"
-         version="0.4.8"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylar.ui"
-         download-size="0"
-         install-size="0"
-         version="0.4.8"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylar.xml"
-         download-size="0"
-         install-size="0"
-         version="0.4.8"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylar.tasklist"
-         download-size="0"
-         install-size="0"
-         version="0.4.8"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylar.ide"
-         download-size="0"
-         install-size="0"
-         version="0.4.8"
+         version="0.4.9"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.mylar.monitor"
-         download-size="0"
-         install-size="0"
-         version="0.4.8"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylar.hypertext"
+         id="org.eclipse.mylar"
          download-size="0"
          install-size="0"
-         version="0.4.8"
+         version="0.4.9"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.mylar.core"
          download-size="0"
          install-size="0"
-         version="0.4.8"
+         version="0.4.9"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.mylar"
+         id="org.eclipse.mylar.tasklist"
          download-size="0"
          install-size="0"
-         version="0.4.8"
+         version="0.4.9"
          unpack="false"/>
 
 </feature>
diff --git a/org.eclipse.mylyn.bugzilla-feature/build.properties b/org.eclipse.mylyn.bugzilla-feature/build.properties
index 4e728a03d..69b877f71 100644
--- a/org.eclipse.mylyn.bugzilla-feature/build.properties
+++ b/org.eclipse.mylyn.bugzilla-feature/build.properties
@@ -16,3 +16,4 @@ src.includes = epl-v10.html,\
                feature.xml,\
                license.html,\
                about.html
+jre.compilation.profile = J2SE-1.5
diff --git a/org.eclipse.mylyn.bugzilla-feature/feature.xml b/org.eclipse.mylyn.bugzilla-feature/feature.xml
index 3edc85e27..87a83fb55 100644
--- a/org.eclipse.mylyn.bugzilla-feature/feature.xml
+++ b/org.eclipse.mylyn.bugzilla-feature/feature.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.mylar.bugzilla_feature"
-      label="Mylar Bugzilla Client"
-      version="0.4.8"
+      label="Mylar Connector: Bugzilla"
+      version="0.4.9"
       provider-name="Eclipse.org"
-      plugin="org.eclipse.mylar.bugzilla.core">
+      plugin="org.eclipse.mylar">
 
    <description>
       Bugzilla client integrated with Eclipse and Mylar, can be used standalone.
@@ -214,61 +214,47 @@ litigation.
    </url>
 
    <requires>
+      <import feature="org.eclipse.mylar_feature" version="0.4.9" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.compare" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.search" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.ide" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.views" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jface.text" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.pde.ui" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.editors" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.update.core"/>
       <import plugin="org.eclipse.update.ui"/>
+      <import plugin="org.eclipse.ui.views" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.forms"/>
+      <import plugin="org.eclipse.jface.text" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.team.ui"/>
       <import plugin="org.eclipse.team.cvs.ui"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.editors" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.team.core"/>
       <import plugin="org.eclipse.team.cvs.core"/>
+      <import plugin="org.eclipse.mylar.core"/>
+      <import plugin="org.eclipse.mylar.tasklist"/>
    </requires>
 
    <plugin
          id="org.eclipse.mylar.bugzilla.core"
          download-size="0"
          install-size="0"
-         version="0.4.8"
+         version="0.4.9"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.mylar.bugzilla.ui"
          download-size="0"
          install-size="0"
-         version="0.4.8"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylar.core"
-         download-size="0"
-         install-size="0"
-         version="0.4.8"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylar.tasklist"
-         download-size="0"
-         install-size="0"
-         version="0.4.8"
+         version="0.4.9"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.mylar.bugs"
          download-size="0"
          install-size="0"
-         version="0.4.8"
+         version="0.4.9"
          unpack="false"/>
 
 </feature>
-- 
cgit v1.2.3