diff options
author | Daniel Strueber | 2023-02-12 16:02:50 +0000 |
---|---|---|
committer | Daniel Strueber | 2023-02-12 16:02:50 +0000 |
commit | 1cf5616fd8786def9b948d9dc41d43306534758e (patch) | |
tree | 881f6ca6a0007743cb80a8d842370dfcc1123d1a | |
parent | c84419009c6358bff2a4f0adb38c7d309d2c7616 (diff) | |
download | org.eclipse.emft.henshin-R180.tar.gz org.eclipse.emft.henshin-R180.tar.xz org.eclipse.emft.henshin-R180.zip |
Fix dependency issues for newer Eclipse versionsR180
Change-Id: I8ab548f3c497f368ca1752e65ce7190d81087917
-rw-r--r-- | plugins/org.eclipse.emf.henshin.examples/META-INF/MANIFEST.MF | 18 | ||||
-rw-r--r-- | plugins/org.eclipse.emf.henshin.examples/src/org/eclipse/emf/henshin/examples/apibasics/TestRule.java | 14 |
2 files changed, 7 insertions, 25 deletions
diff --git a/plugins/org.eclipse.emf.henshin.examples/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.henshin.examples/META-INF/MANIFEST.MF index f38af1db4..b3d9fdf54 100644 --- a/plugins/org.eclipse.emf.henshin.examples/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.henshin.examples/META-INF/MANIFEST.MF @@ -9,31 +9,13 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0", - org.eclipse.core.resources;bundle-version="3.6.0", - org.eclipse.emf.ecore;bundle-version="2.6.0", - org.eclipse.emf.ecore.xmi;bundle-version="2.5.0", - org.eclipse.emf.common, org.eclipse.emf.codegen.ecore;bundle-version="2.6.0", - org.eclipse.emf.henshin.interpreter;bundle-version="0.9.0", org.eclipse.emf.henshin.trace;bundle-version="0.9.0", org.eclipse.emf.henshin.statespace;bundle-version="0.9.0", org.eclipse.emf.henshin.statespace.external;bundle-version="0.9.3", org.eclipse.emf.henshin.wrap;bundle-version="0.9.0", org.eclipse.uml2.uml;bundle-version="5.0.0";resolution:=optional, org.junit, - org.junit.jupiter.api, - org.junit.jupiter.engine, - org.junit.jupiter.migrationsupport, - org.junit.jupiter.params, - org.junit.platform.commons, - org.junit.platform.engine, - org.junit.platform.launcher, - org.junit.platform.runner, - org.junit.platform.suite.api, - org.junit.vintage.engine, - org.hamcrest.core, - org.opentest4j, - org.apiguardian, org.eclipse.emf.henshin.multicda.cda Export-Package: org.eclipse.emf.henshin.examples.aggregation, org.eclipse.emf.henshin.examples.bank, diff --git a/plugins/org.eclipse.emf.henshin.examples/src/org/eclipse/emf/henshin/examples/apibasics/TestRule.java b/plugins/org.eclipse.emf.henshin.examples/src/org/eclipse/emf/henshin/examples/apibasics/TestRule.java index b6383fd2e..cc322bbc1 100644 --- a/plugins/org.eclipse.emf.henshin.examples/src/org/eclipse/emf/henshin/examples/apibasics/TestRule.java +++ b/plugins/org.eclipse.emf.henshin.examples/src/org/eclipse/emf/henshin/examples/apibasics/TestRule.java @@ -1,7 +1,7 @@ package org.eclipse.emf.henshin.examples.apibasics; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.util.List; @@ -17,9 +17,9 @@ import org.eclipse.emf.henshin.interpreter.impl.LoggingApplicationMonitor; import org.eclipse.emf.henshin.interpreter.impl.UnitApplicationImpl; import org.eclipse.emf.henshin.model.Module; import org.eclipse.emf.henshin.model.resource.HenshinResourceSet; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; class TestRule { @@ -37,7 +37,7 @@ class TestRule { * Create the ResourceSet where models and rules are managed in and * register metamodel. */ - @BeforeAll + @BeforeClass public static void setup() { rs = new HenshinResourceSet(BASEDIR); rs.getPackageRegistry().put(BoxingPackage.eINSTANCE.getNsURI(), BoxingPackage.eINSTANCE); @@ -55,7 +55,7 @@ class TestRule { * principle as for the model applies; we need to use unload to reset the * rules. */ - @BeforeEach + @Before public void resetUnitApp() { if (modelResource != null) { modelResource.unload(); |