[525852] Deprecate wrt Bug 582625, minor tidy
diff --git a/releng/org.eclipse.qvto.oomph/setups/qvto.setup b/releng/org.eclipse.qvto.oomph/setups/qvto.setup
index 5bfe822..c5d1df9 100644
--- a/releng/org.eclipse.qvto.oomph/setups/qvto.setup
+++ b/releng/org.eclipse.qvto.oomph/setups/qvto.setup
@@ -327,7 +327,7 @@
<requirement
name="org.eclipse.emf.sdk.feature.group"/>
<requirement
- name="org.eclipse.m2m.qvt.oml.runtime.feature.group"/>
+ name="org.eclipse.m2m.qvt.oml.sdk.feature.group"/>
</setupTask>
<setupTask
xsi:type="projects:ProjectsImportTask">
diff --git a/releng/org.eclipse.qvto.releng.tycho/.launches/Build QVTo Distribution - Nightly.launch b/releng/org.eclipse.qvto.releng.tycho/.launches/Build QVTo Distribution - Nightly.launch
index 47b3cf7..9d8f0a0 100644
--- a/releng/org.eclipse.qvto.releng.tycho/.launches/Build QVTo Distribution - Nightly.launch
+++ b/releng/org.eclipse.qvto.releng.tycho/.launches/Build QVTo Distribution - Nightly.launch
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+ <intAttribute key="M2_COLORS" value="0"/>
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
<stringAttribute key="M2_GOALS" value="clean verify"/>
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
@@ -12,8 +13,10 @@
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
<stringAttribute key="M2_USER_SETTINGS" value=""/>
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+ <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+ <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
- <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+ <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.qvto.releng.tycho}"/>
</launchConfiguration>
diff --git a/tests/org.eclipse.m2m.tests.qvt.oml.ui/src/org/eclipse/m2m/internal/tests/qvt/oml/ui/completion/CompletionTest.java b/tests/org.eclipse.m2m.tests.qvt.oml.ui/src/org/eclipse/m2m/internal/tests/qvt/oml/ui/completion/CompletionTest.java
index 7091881..1a90514 100644
--- a/tests/org.eclipse.m2m.tests.qvt.oml.ui/src/org/eclipse/m2m/internal/tests/qvt/oml/ui/completion/CompletionTest.java
+++ b/tests/org.eclipse.m2m.tests.qvt.oml.ui/src/org/eclipse/m2m/internal/tests/qvt/oml/ui/completion/CompletionTest.java
@@ -345,6 +345,7 @@
}
}
+ @Deprecated /* @deprecated OCL Bug 582625 should provide this */
private static void initializeStandardLibrary() {
for (EClassifier classifier : QvtOperationalStdLibrary.INSTANCE.getStdLibModule().getEClassifiers()) {
if (classifier instanceof PredefinedType) {
