Merge branch 'main' into prepare_4_0_0_M1

eclipse-mylyn · Jul 17, 2023 · b5122ac · b5122ac
2 parents f07f163 + 4faf423
commit b5122ac
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/mylyn.egit/org.eclipse.mylyn.egit.feature/p2.inf b/mylyn.egit/org.eclipse.mylyn.egit.feature/p2.inf
@@ -1,4 +1,6 @@
+update.id=org.eclipse.egit.mylyn.feature.group
+update.range=[0,4)
 update.matchExp = providedCapabilities.exists(pc | \
    pc.namespace == 'org.eclipse.equinox.p2.iu' && \
-     (pc.name == 'org.eclipse.egit.mylyn.feature.group' || \
-       (pc.name == 'org.eclipse.mylyn.egit.feature.feature.group' && pc.version ~= range('[0.0.0,3.26.1)'))))
+     (pc.name == 'org.eclipse.mylyn.egit.feature.feature.group' || \
+       (pc.name == 'org.eclipse.egit.mylyn.feature.group' && pc.version ~= range('[0.0.0,$version$)'))))
diff --git a/org.eclipse.mylyn-site/category.xml b/org.eclipse.mylyn-site/category.xml
@@ -187,6 +187,14 @@
    <bundle id="com.google.guava"/>
    <bundle id="com.google.guava.failureaccess"/>
    <bundle id="com.google.gson"/>
+   <bundle id="org.apache.commons.httpclient"/>
+   <bundle id="org.apache.ws.commons.util"/>
+   <bundle id="com.google.gerrit.common"/>
+   <bundle id="com.google.gerrit.prettify"/>
+   <bundle id="com.google.gerrit.reviewdb"/>
+   <bundle id="com.google.gwt.servlet"/>
+   <bundle id="com.google.gwtjsonrpc"/>
+   <bundle id="com.google.gwtorm"/>
    <category-def name="org.eclipse.mylyn.features.category" label="Mylyn Features">
       <description>
          The Task List and the Task-Focused Interface.