[492948] Ensure Orbit bundles (of latest M7 build) are aggregated.

eclipse · May 4, 2016 · fff6283 · fff6283
1 parent c273cc4
commit fff6283
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/org.eclipse.gef4.repository/category.xml b/org.eclipse.gef4.repository/category.xml
@@ -135,6 +135,10 @@
    <feature url="features/org.eclipse.gef4.zest.fx.compatibility.equinox_1.0.0.qualifier.jar" id="org.eclipse.gef4.zest.fx.compatibility.equinox" version="1.0.0.qualifier">
       <category name="Equinox Compatibility Patches (GEF4 FX, GEF4 MVC, GEF4 MVC.FX, GEF4 Zest.FX)"/>
    </feature>
+   <bundle id="com.google.guava" version="15.0.0.qualifier"/>
+   <bundle id="com.google.inject" version="3.0.0.qualifier"/>
+   <bundle id="com.google.inject.assistedinject" version="3.0.0.qualifier"/>
+   <bundle id="com.google.inject.multibindings" version="3.0.0.qualifier"/>
    <category-def name="GEF4 Geometry" label="GEF4 Geometry"/>
    <category-def name="GEF4 FX" label="GEF4 FX"/>
    <category-def name="GEF4 Zest" label="GEF4 Zest"/>

diff --git a/org.eclipse.gef4.repository/pom.xml b/org.eclipse.gef4.repository/pom.xml
@@ -47,6 +47,7 @@
 								</goals>
 								<configuration>
 									<associateSites>
+									<!--  TODO: refer to e(fx)clipse and other dependencies directly) -->
 										<site>http://download.eclipse.org/releases/mars</site>
 									</associateSites>
 								</configuration>

diff --git a/org.eclipse.gef4.target/NEON.target b/org.eclipse.gef4.target/NEON.target
@@ -23,7 +23,7 @@
 <unit id="com.google.inject" version="3.0.0.v201312141243"/>
 <unit id="com.google.inject.multibindings" version="3.0.0.v201402270930"/>
 <unit id="com.google.inject.assistedinject.source" version="3.0.0.v201402270930"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20160308060251/repository/"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20160501200945/repository/"/>
 </location>
 </locations>
 </target>