[releng] Move to internal Epsilon libraries support
diff --git a/features/org.eclipse.qvtd.epsilon-feature/.project b/features/org.eclipse.qvtd.epsilon-feature/.project
deleted file mode 100644
index be60373..0000000
--- a/features/org.eclipse.qvtd.epsilon-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.qvtd.epsilon-feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.qvtd.epsilon-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.qvtd.epsilon-feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index e0c432e..0000000
--- a/features/org.eclipse.qvtd.epsilon-feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Oct 08 09:44:32 CEST 2009
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/features/org.eclipse.qvtd.epsilon-feature/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.qvtd.epsilon-feature/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/features/org.eclipse.qvtd.epsilon-feature/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/features/org.eclipse.qvtd.epsilon-feature/about.html b/features/org.eclipse.qvtd.epsilon-feature/about.html
deleted file mode 100644
index 2f46c17..0000000
--- a/features/org.eclipse.qvtd.epsilon-feature/about.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head><body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>July 19, 2008</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.qvtd.epsilon-feature/build.properties b/features/org.eclipse.qvtd.epsilon-feature/build.properties
deleted file mode 100644
index fb9d749..0000000
--- a/features/org.eclipse.qvtd.epsilon-feature/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2014 E.D.Willink and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# E.D.Willink - initial API and implementation
-###############################################################################
-bin.includes = feature.xml,\
- feature.properties,\
- about.html
-src.includes = about.html
diff --git a/features/org.eclipse.qvtd.epsilon-feature/feature.properties b/features/org.eclipse.qvtd.epsilon-feature/feature.properties
deleted file mode 100644
index 6d608a0..0000000
--- a/features/org.eclipse.qvtd.epsilon-feature/feature.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2015 E.D.Willink and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# E.D.Willink - initial API and implementation
-###############################################################################
-# NLS_MESSAGEFORMAT_VAR
-
-# "featureName" property - name of the feature
-featureName=QVT Declarative - Epsilon redistribution
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse Modeling Project Updates
-
-# "description" property - description of the feature
-description=Epsilon plugins used by the compiler.
-
-copyright=(c) Copyright Eclipse contributors and others 2015. All rights reserved.
-Visit http://projects.eclipse.org/projects/modeling.mmt.qvtd
diff --git a/features/org.eclipse.qvtd.epsilon-feature/feature.xml b/features/org.eclipse.qvtd.epsilon-feature/feature.xml
deleted file mode 100644
index 44815a8..0000000
--- a/features/org.eclipse.qvtd.epsilon-feature/feature.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.qvtd.epsilon"
- label="%featureName"
- version="1.0.0.qualifier"
- provider-name="%providerName"
- license-feature="org.eclipse.license"
- license-feature-version="0.0.0">
-
- <description url="http://www.eclipse.org/mmt/qvtd">
- %description
- </description>
-
- <copyright>
- [Documentation] Copyright text will be taken from the shared license feature
- </copyright>
-
- <url>
- <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates"/>
- <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates"/>
- </url>
-
- <includes
- id="org.eclipse.qvtd.examples.source"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.epsilon.common"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.epsilon.dependencies"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.epsilon.emc.emf"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.epsilon.eol.engine"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.epsilon.erl.engine"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.epsilon.etl.engine"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.epsilon.flock.engine"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.epsilon.common.dt"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.antlr.runtime_3.1.b1"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.qvtd.master-feature/feature.xml b/features/org.eclipse.qvtd.master-feature/feature.xml
index afbb13d..40b3526 100644
--- a/features/org.eclipse.qvtd.master-feature/feature.xml
+++ b/features/org.eclipse.qvtd.master-feature/feature.xml
@@ -33,10 +33,6 @@
id="org.eclipse.qvtd.doc"
version="0.0.0"/>
- <includes
- id="org.eclipse.qvtd.epsilon"
- version="0.0.0"/>
-
<plugin
id="org.eclipse.qvtd.pivot.qvtbase"
download-size="0"
@@ -176,7 +172,6 @@
version="0.0.0"
unpack="false"/>
-
<plugin
id="org.eclipse.qvtd.pivot.schedule"
download-size="0"
diff --git a/plugins/org.eclipse.qvtd.build.cs2as/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.build.cs2as/META-INF/MANIFEST.MF
index 8ff54f5..5df2cc7 100644
--- a/plugins/org.eclipse.qvtd.build.cs2as/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.build.cs2as/META-INF/MANIFEST.MF
@@ -15,9 +15,6 @@
org.eclipse.ocl.xtext.completeocl;bundle-version="[1.0.0,2.0.0)",
org.eclipse.ocl.examples.codegen;visibility:=reexport,
org.eclipse.ocl.examples.build;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.epsilon.eol.engine;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.epsilon.etl.engine;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.epsilon.emc.emf;bundle-version="[1.2.0,2.0.0)",
org.eclipse.qvtd.codegen;bundle-version="[1.0.0,2.0.0)",
org.eclipse.qvtd.xtext.qvtimperative
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.qvtd.compiler/.classpath b/plugins/org.eclipse.qvtd.compiler/.classpath
index 098194c..b2bfd8d 100644
--- a/plugins/org.eclipse.qvtd.compiler/.classpath
+++ b/plugins/org.eclipse.qvtd.compiler/.classpath
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry exported="true" kind="lib" path="lib/org.eclipse.epsilon.emc.emf_1.3.0.201503231233.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/org.eclipse.epsilon.erl.engine_1.3.0.201503231233.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/org.eclipse.epsilon.etl.engine_1.3.0.201503231233.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/org.eclipse.epsilon.flock.engine_1.3.0.201503231233.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/org.eclipse.epsilon.common_1.3.0.201503231233.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/org.eclipse.epsilon.eol.engine_1.3.0.201503231233.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
diff --git a/plugins/org.eclipse.qvtd.compiler/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.compiler/META-INF/MANIFEST.MF
index be567f4..348a8e0 100644
--- a/plugins/org.eclipse.qvtd.compiler/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.compiler/META-INF/MANIFEST.MF
@@ -3,20 +3,31 @@
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.qvtd.compiler;singleton:=true
Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: .
+Bundle-ClassPath: .,
+ lib/org.eclipse.epsilon.common_1.3.0.201503231233.jar,
+ lib/org.eclipse.epsilon.eol.engine_1.3.0.201503231233.jar,
+ lib/org.eclipse.epsilon.etl.engine_1.3.0.201503231233.jar,
+ lib/org.eclipse.epsilon.flock.engine_1.3.0.201503231233.jar,
+ lib/org.eclipse.epsilon.erl.engine_1.3.0.201503231233.jar,
+ lib/org.eclipse.epsilon.emc.emf_1.3.0.201503231233.jar
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.epsilon.emc.emf;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.epsilon.etl.engine;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.epsilon.flock.engine;bundle-version="[1.3.0,2.0.0)",
org.eclipse.qvtd.pivot.qvtcore,
org.eclipse.qvtd.pivot.qvtimperative,
org.eclipse.qvtd.pivot.qvtrelation,
org.eclipse.qvtd.pivot.schedule
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.qvtd.compiler.internal.etl;
+Export-Package: org.eclipse.epsilon.common.util;x-friends:="org.eclipse.qvtd.build.cs2as,org.eclipse.qvtd.build.cs2as.tests",
+ org.eclipse.epsilon.emc.emf;x-friends:="org.eclipse.qvtd.build.cs2as,org.eclipse.qvtd.build.cs2as.tests",
+ org.eclipse.epsilon.emc.emf.xml;x-friends:="org.eclipse.qvtd.build.cs2as,org.eclipse.qvtd.build.cs2as.tests",
+ org.eclipse.epsilon.eol.exceptions;x-friends:="org.eclipse.qvtd.build.cs2as,org.eclipse.qvtd.build.cs2as.tests",
+ org.eclipse.epsilon.eol.exceptions.models;x-friends:="org.eclipse.qvtd.build.cs2as,org.eclipse.qvtd.build.cs2as.tests",
+ org.eclipse.epsilon.eol.execute.context;x-friends:="org.eclipse.qvtd.build.cs2as,org.eclipse.qvtd.build.cs2as.tests",
+ org.eclipse.epsilon.eol.models;x-friends:="org.eclipse.qvtd.build.cs2as,org.eclipse.qvtd.build.cs2as.tests",
+ org.eclipse.epsilon.eol.types;x-friends:="org.eclipse.qvtd.build.cs2as,org.eclipse.qvtd.build.cs2as.tests",
+ org.eclipse.qvtd.compiler.internal.etl;
uses:="org.eclipse.ocl.pivot,
org.eclipse.epsilon.eol.models,
org.eclipse.ui.plugin,
diff --git a/plugins/org.eclipse.qvtd.compiler/build.properties b/plugins/org.eclipse.qvtd.compiler/build.properties
index 586f09a..32fb476 100644
--- a/plugins/org.eclipse.qvtd.compiler/build.properties
+++ b/plugins/org.eclipse.qvtd.compiler/build.properties
@@ -2,10 +2,15 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml,\
- plugin.properties,\
model/,\
about.html,\
- build.properties
+ build.properties,\
+ lib/org.eclipse.epsilon.common_1.3.0.201503231233.jar,\
+ lib/org.eclipse.epsilon.eol.engine_1.3.0.201503231233.jar,\
+ lib/org.eclipse.epsilon.etl.engine_1.3.0.201503231233.jar,\
+ lib/org.eclipse.epsilon.flock.engine_1.3.0.201503231233.jar,\
+ lib/org.eclipse.epsilon.erl.engine_1.3.0.201503231233.jar,\
+ lib/org.eclipse.epsilon.emc.emf_1.3.0.201503231233.jar,\
+ plugin.properties
additional.bundles = org.eclipse.ocl.jdt.annotation7
src.includes = about.html
diff --git a/plugins/org.eclipse.qvtd.compiler/lib/ReadMe.txt b/plugins/org.eclipse.qvtd.compiler/lib/ReadMe.txt
new file mode 100644
index 0000000..d363265
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.compiler/lib/ReadMe.txt
@@ -0,0 +1,5 @@
+These Epsilon libraries are required until the QVTr to QVTi transformation chain is recoded using QVTr.
+
+The libraries are bundled internally to avoid problems with the packing of Java 6 builds in a Java 7 build.
+
+See Bug 463510.
diff --git a/plugins/org.eclipse.qvtd.compiler/lib/org.eclipse.epsilon.common_1.3.0.201503231233.jar b/plugins/org.eclipse.qvtd.compiler/lib/org.eclipse.epsilon.common_1.3.0.201503231233.jar
new file mode 100644
index 0000000..3eb8074
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.compiler/lib/org.eclipse.epsilon.common_1.3.0.201503231233.jar
Binary files differ
diff --git a/plugins/org.eclipse.qvtd.compiler/lib/org.eclipse.epsilon.emc.emf_1.3.0.201503231233.jar b/plugins/org.eclipse.qvtd.compiler/lib/org.eclipse.epsilon.emc.emf_1.3.0.201503231233.jar
new file mode 100644
index 0000000..a7ba731
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.compiler/lib/org.eclipse.epsilon.emc.emf_1.3.0.201503231233.jar
Binary files differ
diff --git a/plugins/org.eclipse.qvtd.compiler/lib/org.eclipse.epsilon.eol.engine_1.3.0.201503231233.jar b/plugins/org.eclipse.qvtd.compiler/lib/org.eclipse.epsilon.eol.engine_1.3.0.201503231233.jar
new file mode 100644
index 0000000..57aead3
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.compiler/lib/org.eclipse.epsilon.eol.engine_1.3.0.201503231233.jar
Binary files differ
diff --git a/plugins/org.eclipse.qvtd.compiler/lib/org.eclipse.epsilon.erl.engine_1.3.0.201503231233.jar b/plugins/org.eclipse.qvtd.compiler/lib/org.eclipse.epsilon.erl.engine_1.3.0.201503231233.jar
new file mode 100644
index 0000000..600b5b2
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.compiler/lib/org.eclipse.epsilon.erl.engine_1.3.0.201503231233.jar
Binary files differ
diff --git a/plugins/org.eclipse.qvtd.compiler/lib/org.eclipse.epsilon.etl.engine_1.3.0.201503231233.jar b/plugins/org.eclipse.qvtd.compiler/lib/org.eclipse.epsilon.etl.engine_1.3.0.201503231233.jar
new file mode 100644
index 0000000..95a2959
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.compiler/lib/org.eclipse.epsilon.etl.engine_1.3.0.201503231233.jar
Binary files differ
diff --git a/plugins/org.eclipse.qvtd.compiler/lib/org.eclipse.epsilon.flock.engine_1.3.0.201503231233.jar b/plugins/org.eclipse.qvtd.compiler/lib/org.eclipse.epsilon.flock.engine_1.3.0.201503231233.jar
new file mode 100644
index 0000000..5a03dcb
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.compiler/lib/org.eclipse.epsilon.flock.engine_1.3.0.201503231233.jar
Binary files differ
diff --git a/plugins/org.eclipse.qvtd.compiler/plugin.xml b/plugins/org.eclipse.qvtd.compiler/plugin.xml
deleted file mode 100644
index 5b61a7b..0000000
--- a/plugins/org.eclipse.qvtd.compiler/plugin.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.epsilon.common.dt.tool">
- <tool
- class="org.eclipse.qvtd.compiler.internal.etl.PivotUtil"
- defaultName="PivotUtil">
- </tool>
- </extension>
-</plugin>
diff --git a/releng/org.eclipse.qvtd.releng.buckminster/releng/qvtd.rmap b/releng/org.eclipse.qvtd.releng.buckminster/releng/qvtd.rmap
index 9df006a..b082f85 100644
--- a/releng/org.eclipse.qvtd.releng.buckminster/releng/qvtd.rmap
+++ b/releng/org.eclipse.qvtd.releng.buckminster/releng/qvtd.rmap
@@ -25,11 +25,11 @@
<rm:locator pattern="^org\.eclipse\.xtext.*" searchPathRef="xtext"/>
<rm:locator pattern="^com\.google.(inject|guava)$" searchPathRef="xtext"/>
<!--rm:locator pattern="^org\.antlr\.runtime$" searchPathRef="xtext"/-->
- <rm:locator pattern="^org\.antlr\.runtime_3\.1.*" searchPathRef="epsilon"/>
+ <!--rm:locator pattern="^org\.antlr\.runtime_3\.1.*" searchPathRef="epsilon"/-->
<rm:locator pattern="^org\.eclipse\.draw2d$" searchPathRef="gef"/>
<rm:locator pattern="^org\.eclipse\.emf.*" searchPathRef="emf"/>
<rm:locator pattern="^org\.eclipse\.xsd.*" searchPathRef="emf"/>
- <rm:locator pattern="^org\.eclipse\.epsilon.*" searchPathRef="epsilon"/>
+ <!--rm:locator pattern="^org\.eclipse\.epsilon.*" searchPathRef="epsilon"/-->
<rm:locator pattern="^org\.eclipse\.uml2.*" searchPathRef="uml"/>
<rm:locator pattern="^org\.eclipse\.test$" searchPathRef="eclipse-tests-source-code"/>
<rm:locator pattern="^org\.eclipse\.ant\.optional\.junit$" searchPathRef="eclipse-tests-source-code"/>
@@ -368,7 +368,7 @@
</rm:uri>
</rm:provider>
</rm:searchPath>
- <rm:searchPath name="epsilon">
+ <!--rm:searchPath name="epsilon">
<rm:provider componentTypes="eclipse.feature,osgi.bundle" resolutionFilter="(resolve.target.platform=true)" readerType="p2" source="false" mutable="false">
<rm:property key="buckminster.source" value="false"/>
<rm:property key="buckminster.mutable" value="false"/>
@@ -383,7 +383,7 @@
<bc:propertyRef key="eclipse.download"/>
</rm:uri>
</rm:provider>
- </rm:searchPath>
+ </rm:searchPath-->
<rm:searchPath name="orbit">
<rm:provider componentTypes="eclipse.feature,osgi.bundle" resolutionFilter="(resolve.target.platform=true)" readerType="p2" source="false" mutable="false">
<rm:property key="buckminster.source" value="false"/>
diff --git a/tests/org.eclipse.qvtd.all.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.qvtd.all.tests/META-INF/MANIFEST.MF
index e521411..2566a18 100644
--- a/tests/org.eclipse.qvtd.all.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.qvtd.all.tests/META-INF/MANIFEST.MF
@@ -6,9 +6,6 @@
Bundle-ClassPath: .
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.epsilon.emc.emf;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.epsilon.etl.engine;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.epsilon.flock.engine;bundle-version="[1.2.0,2.0.0)",
org.eclipse.ocl.xtext.oclinecore,
org.eclipse.ocl.examples.xtext.tests,
org.eclipse.qvtd.xtext.qvtbase.tests,
diff --git a/tests/org.eclipse.qvtd.build.cs2as.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.qvtd.build.cs2as.tests/META-INF/MANIFEST.MF
index fa3b865..ab17a75 100644
--- a/tests/org.eclipse.qvtd.build.cs2as.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.qvtd.build.cs2as.tests/META-INF/MANIFEST.MF
@@ -14,8 +14,6 @@
org.eclipse.ocl.jdt.annotation7;visibility:=reexport,
org.eclipse.qvtd.build.cs2as.tests;visibility:=reexport,
org.eclipse.emf.mwe2.launch;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.epsilon.eol.engine;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.epsilon.emc.emf;bundle-version="[1.3.0,2.0.0)",
org.eclipse.ocl.xtext.completeocl;bundle-version="[1.0.0,2.0.0)",
org.eclipse.ocl.examples.build;bundle-version="[2.0.0,3.0.0)",
org.eclipse.qvtd.xtext.qvtimperative,
diff --git a/tests/org.eclipse.qvtd.build.etl.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.qvtd.build.etl.tests/META-INF/MANIFEST.MF
index 0b21cb7..2b2e520 100644
--- a/tests/org.eclipse.qvtd.build.etl.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.qvtd.build.etl.tests/META-INF/MANIFEST.MF
@@ -3,9 +3,7 @@
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.qvtd.build.etl.tests;singleton:=true
Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.eclipse.epsilon.common.dt;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.epsilon.emc.emf;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.ocl.xtext.completeocl;bundle-version="[1.0.0,2.0.0)",
+Require-Bundle: org.eclipse.ocl.xtext.completeocl;bundle-version="[1.0.0,2.0.0)",
org.eclipse.ocl.xtext.oclstdlib;bundle-version="[1.0.0,2.0.0)",
org.eclipse.ocl.examples.xtext.tests;bundle-version="[3.5.0,4.0.0)",
org.eclipse.qvtd.xtext.qvtbase.tests,
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcDomainUsageTests.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcDomainUsageTests.java
index 0d1072d..f24a9c3 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcDomainUsageTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcDomainUsageTests.java
@@ -199,7 +199,7 @@
MyQVT myQVT = createQVT();
URI transformURI = getProjectFileURI("models/uml2rdbms.qvtu.qvtc");
Transformation asTransformation = loadTransformation(myQVT, transformURI);
- myQVT.checkAnalysis(asTransformation, true);
+ myQVT.checkAnalysis(asTransformation, false);
myQVT.dispose();
}
