diff options
6 files changed, 45 insertions, 12 deletions
diff --git a/features/org.eclipse.emf.cdo.site-feature/category.xml b/features/org.eclipse.emf.cdo.site-feature/category.xml index 00ce28bdfe..e16b84d037 100644 --- a/features/org.eclipse.emf.cdo.site-feature/category.xml +++ b/features/org.eclipse.emf.cdo.site-feature/category.xml @@ -156,6 +156,9 @@ <feature id="org.eclipse.emf.cdo.releng.winexplorer" version="0.0.0"> <category name="org.eclipse.emf.releng.category"/> </feature> + <feature id="org.eclipse.emf.cdo.releng.gitbash" version="0.0.0"> + <category name="org.eclipse.emf.releng.category"/> + </feature> <feature id="org.eclipse.emf.cdo.releng.workingsets" version="0.0.0"> <category name="org.eclipse.emf.releng.category"/> </feature> @@ -171,9 +174,6 @@ <feature id="org.eclipse.emf.cdo.migrator" version="0.0.0"> <category name="org.eclipse.emf.cdo.category"/> </feature> - <feature id="org.eclipse.emf.cdo.releng.gitbash" version="0.0.0"> - <category name="org.eclipse.emf.releng.category"/> - </feature> <feature id="org.eclipse.emf.cdo.releng.projectcopy" version="0.0.0"> <category name="org.eclipse.emf.releng.category"/> </feature> @@ -184,7 +184,7 @@ <category name="org.eclipse.emf.cdo.hidden.category"/> </feature> <feature id="org.eclipse.emf.cdo.epp" version="0.0.0"> - <category name="hidden_category"/> + <category name="org.eclipse.emf.releng.hidden.category"/> </feature> <category-def name="org.eclipse.emf.releng.category" label="CDO Release Engineering"/> <category-def name="org.eclipse.emf.cdo.category" label="CDO Model Repository"/> @@ -192,5 +192,5 @@ <category-def name="org.eclipse.emf.cdo.dawn.category" label="CDO Dawn"/> <category-def name="org.eclipse.net4j.category" label="Net4j Signalling Platform"/> <category-def name="org.eclipse.net4j.db.category" label="Net4j DB Framework"/> - <category-def name="hidden_category"/> + <category-def name="org.eclipse.emf.releng.hidden.category"/> </site> diff --git a/features/org.eclipse.net4j-feature/feature.xml b/features/org.eclipse.net4j-feature/feature.xml index 2f44264605..ced428d6ba 100644 --- a/features/org.eclipse.net4j-feature/feature.xml +++ b/features/org.eclipse.net4j-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.net4j" label="%featureName" - version="4.2.100.qualifier" + version="4.3.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg" license-feature="org.eclipse.emf.cdo.license" diff --git a/features/org.eclipse.net4j.defs-feature/feature.xml b/features/org.eclipse.net4j.defs-feature/feature.xml index f75f204bd1..283aebf706 100644 --- a/features/org.eclipse.net4j.defs-feature/feature.xml +++ b/features/org.eclipse.net4j.defs-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.net4j.defs" label="%featureName" - version="4.2.100.qualifier" + version="4.3.0.qualifier" provider-name="%providerName" license-feature="org.eclipse.emf.cdo.license" license-feature-version="0.0.0"> diff --git a/features/org.eclipse.net4j.sdk-feature/feature.xml b/features/org.eclipse.net4j.sdk-feature/feature.xml index 53b9aff83e..bf25066620 100644 --- a/features/org.eclipse.net4j.sdk-feature/feature.xml +++ b/features/org.eclipse.net4j.sdk-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.net4j.sdk" label="%featureName" - version="4.2.100.qualifier" + version="4.3.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg" license-feature="org.eclipse.emf.cdo.license" diff --git a/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex b/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex index f648628cca..e007312de8 100644 --- a/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex +++ b/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex @@ -27,6 +27,13 @@ <cs:dependency name="org.eclipse.jgit" componentType="eclipse.feature"/> <cs:dependency name="org.eclipse.egit" componentType="eclipse.feature"/> + <cs:dependency name="org.eclipse.buckminster.core.feature.feature.group" componentType="eclipse.feature"/> + <cs:dependency name="org.eclipse.buckminster.git.feature.feature.group" componentType="eclipse.feature"/> + <cs:dependency name="org.eclipse.buckminster.pde.feature.feature.group" componentType="eclipse.feature"/> + + <cs:dependency name="org.eclipse.egit" componentType="eclipse.feature"/> + <cs:dependency name="org.eclipse.egit" componentType="eclipse.feature"/> + <cs:dependency name="org.eclipse.swtbot" componentType="eclipse.feature"/> <cs:dependency name="org.eclipse.swtbot.eclipse" componentType="eclipse.feature"/> <cs:dependency name="org.eclipse.swtbot.eclipse.gef" componentType="eclipse.feature"/> @@ -39,7 +46,7 @@ <cs:dependency name="org.dom4j" componentType="eclipse.feature"/> <cs:dependency name="javax.persistence" componentType="eclipse.feature"/> <cs:dependency name="javax.annotation" componentType="osgi.bundle"/> - <cs:dependency name="oracle.database.driver.jdk50" componentType="osgi.bundle"/> + <cs:dependency name="oracle.database.driver" componentType="osgi.bundle"/> </cs:dependencies> <cs:actions> diff --git a/plugins/org.eclipse.emf.cdo.releng/build.rmap b/plugins/org.eclipse.emf.cdo.releng/build.rmap index 1adafa1f5d..823e55a5f0 100644 --- a/plugins/org.eclipse.emf.cdo.releng/build.rmap +++ b/plugins/org.eclipse.emf.cdo.releng/build.rmap @@ -4,7 +4,7 @@ <!-- Properties --> - <rm:property mutable="true" key="platform.version" value="3.8"/> + <rm:property mutable="true" key="platform.version" value="4.3"/> <rm:property mutable="true" key="emf.version" value="2.9"/> <rm:property mutable="true" key="orbit.version" value="R20130517111416"/> @@ -13,6 +13,10 @@ <rm:locator searchPathRef="git" pattern="^org\.eclipse\.emf\.cdo(?:\..+)?$"/> <rm:locator searchPathRef="git" pattern="^org\.eclipse\.net4j(?:\..+)?$"/> <rm:locator searchPathRef="git" pattern="^org\.gastro(?:\..+)?$"/> + <!-- + <rm:locator searchPathRef="p2pool" /> + --> + <rm:locator searchPathRef="junit4" pattern="^org\.junit4$"/> <rm:locator searchPathRef="p2"/> <!-- Search Paths --> @@ -34,6 +38,28 @@ </rm:provider> </rm:searchPath> + <!-- + <rm:searchPath name="p2pool"> + <rm:provider componentTypes="jar,osgi.bundle,buckminster" readerType="url" mutable="false" source="false"> + <rm:uri format="file:/C:/develop/bin/p2pool/plugins/{0}_*.jar"> + <bc:propertyRef key="buckminster.component" /> + </rm:uri> + </rm:provider> + <rm:provider componentTypes="jar,eclipse.feature" readerType="url" mutable="false" source="false"> + <rm:uri format="file:/C:/develop/bin/p2pool/features/{0}_*.jar"> + <bc:propertyRef key="buckminster.component" /> + </rm:uri> + </rm:provider> + </rm:searchPath> + --> + + <rm:searchPath name="junit4"> + <rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false"> + <rm:uri format="http://download.eclipse.org/eclipse/updates/3.8"> + </rm:uri> + </rm:provider> + </rm:searchPath> + <rm:searchPath name="p2"> <!-- PLATFORM --> @@ -140,7 +166,7 @@ <!-- BUCKMINSTER --> <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> - <rm:uri format="http://download.eclipse.org/tools/buckminster/headless-4.3"/> + <rm:uri format="http://download.eclipse.org/tools/buckminster/updates-4.3"/> </rm:provider> <!-- NEBULA --> @@ -162,7 +188,7 @@ <!-- ORACLE.COM --> <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> - <rm:uri format="http://download.oracle.com/otn_software/oepe/juno"/> + <rm:uri format="http://download.oracle.com/otn_software/oepe/kepler"/> </rm:provider> <!-- EVLER.ORG --> |