diff options
| author | Vincent Lorenzo | 2015-02-18 11:52:29 +0000 |
|---|---|---|
| committer | Vincent Lorenzo | 2015-02-18 14:03:30 +0000 |
| commit | eb09607cd4fe5b2545c0adacd0a03f51f19bd083 (patch) | |
| tree | f722a078102042fa57b0028a865ab0b88e4b129f /tests | |
| parent | c984b4700a718b800a8df6fb401345289c193dc5 (diff) | |
| download | org.eclipse.papyrus-eb09607cd4fe5b2545c0adacd0a03f51f19bd083.tar.gz org.eclipse.papyrus-eb09607cd4fe5b2545c0adacd0a03f51f19bd083.tar.xz org.eclipse.papyrus-eb09607cd4fe5b2545c0adacd0a03f51f19bd083.zip | |
460098: [Table 2] Papyrus must use the new nattable release on branch master
Diffstat (limited to 'tests')
7 files changed, 14 insertions, 7 deletions
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java index 792a12f2287..96664f6d5aa 100644 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java @@ -52,7 +52,9 @@ public class BundlesTests extends AbstractPapyrusTest { private static final String BATIK_VERSION = "[1.6.0,1.7.0)"; //$NON-NLS-1$
- private static final String NATTABLE_VERSION = "1.1.0"; //$NON-NLS-1$
+ private static final String NATTABLE_VERSION = "1.2.0"; //$NON-NLS-1$
+
+ private static final String GLAZED_LIST_VERSION = "1.9.0";//$NON-NLS-1$
private static final String PAPYRUS_VERSION = BundleTestsUtils.PAPYRUS_VERSION;
@@ -284,6 +286,11 @@ public class BundlesTests extends AbstractPapyrusTest { }
@Test
+ public void glazedListDependencyVersionTest() {
+ testPapyrusDependencies2("ca.odell.glazedlists", NATTABLE_VERSION);//$NON-NLS-1$
+ }
+
+ @Test
public void guavaDependencyVersionText() {
testPapyrusDependencies2("com.google.guava", "11.0.0");//$NON-NLS-1$ //$NON-NLS-2$
}
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF index e0643f5b39a..26822379c1d 100644 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="1.2.0",
org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF index 98a11e9e8cf..66cf5b94ca7 100755 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.junit,
org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF index 11c4b19023a..5819577010d 100755 --- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Require-Bundle: org.junit;bundle-version="4.11.0", org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
org.eclipse.papyrus.sysml;bundle-version="1.1.0",
org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF index 8ab5a3e4606..dac4e15b18d 100644 --- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",
org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",
org.eclipse.papyrus.uml.nattable;bundle-version="1.1.0",
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/META-INF/MANIFEST.MF index 8d5a8a7870b..a35eba6ed98 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0", org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0", ca.odell.glazedlists;bundle-version="1.9.0", - org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0", + org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)", org.eclipse.papyrus.infra.tools;bundle-version="1.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF index 8cc78aa00a9..bc1e414b583 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Require-Bundle: org.junit;bundle-version="4.11.0", org.eclipse.uml2.uml,
org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
org.eclipse.emf.common,
|