Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2009-07-30 07:53:20 +0000
committerEike Stepper2009-07-30 07:53:20 +0000
commita918aea5b266822680be39abf33bd51043c19187 (patch)
treec53df6ba776ae04cae4a7c00911ba07fd33bea20 /plugins
parente536d08d68a0fc536ad2eda1eade72019fc37bd6 (diff)
downloadcdo-a918aea5b266822680be39abf33bd51043c19187.tar.gz
cdo-a918aea5b266822680be39abf33bd51043c19187.tar.xz
cdo-a918aea5b266822680be39abf33bd51043c19187.zip
[284834] [Releng] Migrate Net4j and CDO builds to Athena/Hudson
https://bugs.eclipse.org/bugs/show_bug.cgi?id=284834
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.jdt.core.prefs3
-rw-r--r--plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF2
4 files changed, 5 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.db/META-INF/MANIFEST.MF
index 1fdf98daef..6d284f6cc7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.db/META-INF/MANIFEST.MF
@@ -17,6 +17,6 @@ Require-Bundle: org.eclipse.emf.cdo.tests;bundle-version="[3.0.0,4.0.0)";visibil
org.eclipse.net4j.db.h2;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
Eclipse-BuddyPolicy: dependent
Import-Package: com.mysql.jdbc.jdbc2.optional;version="[5.0.0,6.0.0)",
- org.apache.derby.jdbc,
+ org.apache.derby.jdbc;version="[10.5.0,11.0.0)",
org.h2.jdbcx;version="[1.1.0,1.2.0)",
org.hsqldb.jdbc;version="[1.0.0,2.0.0)"
diff --git a/plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.jdt.core.prefs
index 142e6403c9..65150aceff 100644
--- a/plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Aug 01 21:17:00 CEST 2008
+#Thu Jul 30 09:22:25 CEST 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -8,6 +8,7 @@ org.eclipse.jdt.core.codeComplete.localPrefixes=
org.eclipse.jdt.core.codeComplete.localSuffixes=
org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
diff --git a/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF
index e3dbb6c367..532dd9c8d7 100644
--- a/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j.db;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
-Import-Package: org.apache.derby.jdbc;version="[10.5.0,11.0.0)"
+Import-Package: org.apache.derby.iapi.jdbc;version="[10.5.0,11.0.0)"
Export-Package: org.eclipse.net4j.db.derby;version="3.0.0",
org.eclipse.net4j.db.internal.derby.bundle;version="3.0.0";x-internal:=true
Eclipse-RegisterBuddy: org.eclipse.net4j.db
diff --git a/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF
index 7910eaeda5..248bde1b8f 100644
--- a/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j.db.postgresql;bundle-version="[3.0.0,4.0.0)";resolution:=optional;visibility:=reexport
Import-Package: com.mysql.jdbc;version="[5.1.0,6.0.0)";resolution:=optional,
com.mysql.jdbc.jdbc2.optional;version="[5.1.0,6.0.0)";resolution:=optional,
- org.apache.derby.jdbc,
+ org.apache.derby.jdbc;version="[10.5.0,11.0.0)",
org.hsqldb.jdbc;resolution:=optional
Export-Package: org.eclipse.net4j.db.tests;version="3.0.0",
org.eclipse.net4j.db.tests.bundle;version="3.0.0";x-internal:=true

Back to the top