Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-07-15 11:54:17 +0000
committerEike Stepper2013-07-15 18:36:33 +0000
commitcf43aa2347c0f2f29e7170157878a87b38178fb6 (patch)
treef0e95718b5f66aa0589eee7857b3250c3b3b21f0 /plugins/org.eclipse.emf.cdo.releng
parent4c03294af9787989056b98585ac6abb4f8d5b52e (diff)
downloadcdo-cf43aa2347c0f2f29e7170157878a87b38178fb6.tar.gz
cdo-cf43aa2347c0f2f29e7170157878a87b38178fb6.tar.xz
cdo-cf43aa2347c0f2f29e7170157878a87b38178fb6.zip
Fix oracle driver reference
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.releng')
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/buckminster.cspex9
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/build.rmap32
2 files changed, 37 insertions, 4 deletions
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 -->

Back to the top