diff options
| author | Stephan Leicht Vogt | 2013-04-19 09:29:24 +0000 |
|---|---|---|
| committer | Stephan Leicht Vogt | 2013-04-25 08:24:22 +0000 |
| commit | bca22eb97133708b2b191eddbb582a50141c5862 (patch) | |
| tree | a6a54a3d0b19b2d000e4141e4c3e295c92854723 | |
| parent | 3ece1966235e4b035cadf9600c18fe1cf6c5b728 (diff) | |
| download | org.eclipse.scout.sdk-bca22eb97133708b2b191eddbb582a50141c5862.tar.gz org.eclipse.scout.sdk-bca22eb97133708b2b191eddbb582a50141c5862.tar.xz org.eclipse.scout.sdk-bca22eb97133708b2b191eddbb582a50141c5862.zip | |
bug 405846: Update JUnit dependencies to 4.9
https://bugs.eclipse.org/bugs/show_bug.cgi?id=405846
Change-Id: I52dc1bfb346bd872c8da13c63dc7f9b469fa9582
| -rw-r--r-- | org.eclipse.scout.sdk.test/META-INF/MANIFEST.MF | 14 | ||||
| -rw-r--r-- | org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/test/AbstractScoutSdkTest.java | 1 | ||||
| -rw-r--r-- | org.eclipse.scout.sdk/.gitignore | 1 |
3 files changed, 5 insertions, 11 deletions
diff --git a/org.eclipse.scout.sdk.test/META-INF/MANIFEST.MF b/org.eclipse.scout.sdk.test/META-INF/MANIFEST.MF index 4d3dccaec..0a597b14e 100644 --- a/org.eclipse.scout.sdk.test/META-INF/MANIFEST.MF +++ b/org.eclipse.scout.sdk.test/META-INF/MANIFEST.MF @@ -5,11 +5,7 @@ Bundle-SymbolicName: org.eclipse.scout.sdk.test;singleton:=true Bundle-Version: 3.9.0.qualifier Bundle-Activator: org.eclipse.scout.sdk.internal.test.Activator Bundle-Vendor: Eclipse Scout Project -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", - org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", - org.eclipse.compare;bundle-version="[3.5.0,4.0.0)", - org.eclipse.compare.core;bundle-version="[3.5.0,4.0.0)", - org.eclipse.scout.sdk;bundle-version="[3.9.0,4.0.0)";visibility:=reexport, +Require-Bundle: org.eclipse.scout.sdk;bundle-version="[3.9.0,4.0.0)";visibility:=reexport, org.eclipse.scout.sdk.ui;bundle-version="[3.9.0,4.0.0)";visibility:=reexport, org.eclipse.scout.rt.testing.shared;bundle-version="[3.9.0,4.0.0)";visibility:=reexport Bundle-RequiredExecutionEnvironment: JavaSE-1.6 @@ -33,7 +29,7 @@ Export-Package: org.eclipse.scout.sdk, org.eclipse.scout.sdk.internal.test.workspace, org.eclipse.scout.sdk.operation.form.formdata, org.eclipse.scout.sdk.test -Import-Package: org.hamcrest.core;version="[1.1.0,2.0.0)", - org.junit;version="[4.3.0,5.0.0)", - org.junit.runner;version="[4.3.0,5.0.0)", - org.junit.runners;version="[4.3.0,5.0.0)" +Import-Package: org.hamcrest.core;version="[1.3.0,2.0.0)", + org.junit;version="[4.9.0,5.0.0)", + org.junit.runner;version="[4.9.0,5.0.0)", + org.junit.runners;version="[4.9.0,5.0.0)" diff --git a/org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/test/AbstractScoutSdkTest.java b/org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/test/AbstractScoutSdkTest.java index 9f99fd993..915a19654 100644 --- a/org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/test/AbstractScoutSdkTest.java +++ b/org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/test/AbstractScoutSdkTest.java @@ -59,7 +59,6 @@ public abstract class AbstractScoutSdkTest { protected static void showEgitMessageBoxes(boolean show) { try { // preference store as defined in org.eclipse.ui.plugin.AbstractUIPlugin.getPreferenceStore() - @SuppressWarnings("deprecation") IPreferenceStore store = new ScopedPreferenceStore(new InstanceScope(), "org.eclipse.egit.ui"); // following constants are coming from class org.eclipse.egit.ui.UIPreferences: diff --git a/org.eclipse.scout.sdk/.gitignore b/org.eclipse.scout.sdk/.gitignore deleted file mode 100644 index 40a85ffb2..000000000 --- a/org.eclipse.scout.sdk/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/.settings |