[424052] Use JavaCore.VERSION_1_8
diff --git a/doc/org.eclipse.m2m.qvt.oml.doc/build.xml b/doc/org.eclipse.m2m.qvt.oml.doc/build.xml
index a908280..9989c2e 100644
--- a/doc/org.eclipse.m2m.qvt.oml.doc/build.xml
+++ b/doc/org.eclipse.m2m.qvt.oml.doc/build.xml
@@ -16,8 +16,8 @@
<property name="javacDebugInfo" value="on"/>
<property name="javacVerbose" value="true"/>
<!-- TODO: set correct Java level -->
- <property name="javacSource" value="1.5"/>
- <property name="javacTarget" value="1.5"/>
+ <property name="javacSource" value="1.8"/>
+ <property name="javacTarget" value="1.8"/>
<property name="compilerArg" value=""/>
<path id="path_bootclasspath">
<fileset dir="${java.home}/lib">
diff --git a/doc/org.eclipse.m2m.qvt.oml.doc/build/javadoc.xml.template b/doc/org.eclipse.m2m.qvt.oml.doc/build/javadoc.xml.template
index 031f3f9..0ebfa0d 100644
--- a/doc/org.eclipse.m2m.qvt.oml.doc/build/javadoc.xml.template
+++ b/doc/org.eclipse.m2m.qvt.oml.doc/build/javadoc.xml.template
@@ -52,7 +52,7 @@
noindex="false"
nonavbar="false"
notree="false"
- source="1.5"
+ source="1.8"
splitindex="true"
use="true"
version="true">
diff --git a/examples/org.eclipse.m2m.qvt.oml.econ2009.tutorial/META-INF/MANIFEST.MF b/examples/org.eclipse.m2m.qvt.oml.econ2009.tutorial/META-INF/MANIFEST.MF
index 171e641..aede2f2 100644
--- a/examples/org.eclipse.m2m.qvt.oml.econ2009.tutorial/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.m2m.qvt.oml.econ2009.tutorial/META-INF/MANIFEST.MF
@@ -7,6 +7,6 @@
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.common.ui
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization:
plugin
diff --git a/plugins/org.eclipse.m2m.qvt.oml.runtime.jdt/src/org/eclipse/m2m/internal/qvt/oml/jdt/ui/wizard/project/JdtProjectIntegrationImpl.java b/plugins/org.eclipse.m2m.qvt.oml.runtime.jdt/src/org/eclipse/m2m/internal/qvt/oml/jdt/ui/wizard/project/JdtProjectIntegrationImpl.java
index e6bae59..7944fc3 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.runtime.jdt/src/org/eclipse/m2m/internal/qvt/oml/jdt/ui/wizard/project/JdtProjectIntegrationImpl.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.runtime.jdt/src/org/eclipse/m2m/internal/qvt/oml/jdt/ui/wizard/project/JdtProjectIntegrationImpl.java
@@ -158,7 +158,7 @@
@Override
public IStatus validateJavaTypeName(String name) {
- return JavaConventions.validateJavaTypeName(name.trim(), JavaCore.VERSION_1_3, JavaCore.VERSION_1_3);
+ return JavaConventions.validateJavaTypeName(name.trim(), JavaCore.VERSION_1_8, JavaCore.VERSION_1_8, null);
}
@Override
@@ -180,7 +180,7 @@
}
private static IStatus validatePackageName(String name) {
- return JavaConventions.validatePackageName(name, JavaCore.VERSION_1_3, JavaCore.VERSION_1_3);
+ return JavaConventions.validatePackageName(name, JavaCore.VERSION_1_8, JavaCore.VERSION_1_8);
}
private static String getDefaultEEName() {
diff --git a/releng/org.eclipse.m2m.qvt.oml.tools.coverage.releng/setup/dev_env.setup b/releng/org.eclipse.m2m.qvt.oml.tools.coverage.releng/setup/dev_env.setup
index 28bf0d5..ebc1e98 100644
--- a/releng/org.eclipse.m2m.qvt.oml.tools.coverage.releng/setup/dev_env.setup
+++ b/releng/org.eclipse.m2m.qvt.oml.tools.coverage.releng/setup/dev_env.setup
@@ -1234,15 +1234,15 @@
<setupTask
xsi:type="setup:PreferenceTask"
key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.targetPlatform"
- value="1.5"/>
+ value="1.8"/>
<setupTask
xsi:type="setup:PreferenceTask"
key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.source"
- value="1.5"/>
+ value="1.8"/>
<setupTask
xsi:type="setup:PreferenceTask"
key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.compliance"
- value="1.5"/>
+ value="1.8"/>
<setupTask
xsi:type="setup:PreferenceTask"
key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.nullReference"
diff --git a/releng/org.eclipse.qvto.releng.tycho/pom.xml b/releng/org.eclipse.qvto.releng.tycho/pom.xml
index 00dd610..0b7f599 100644
--- a/releng/org.eclipse.qvto.releng.tycho/pom.xml
+++ b/releng/org.eclipse.qvto.releng.tycho/pom.xml
@@ -100,9 +100,6 @@
<requireMavenVersion>
<version>3.6.3</version>
</requireMavenVersion>
- <!--requireJavaVersion>
- <version>1.5</version>
- </requireJavaVersion-->
</rules>
</configuration>
</execution>
diff --git a/tests/org.eclipse.m2m.tests.qvt.oml/org.eclipse.m2m.tests.qvt.oml.StandaloneTests.launch b/tests/org.eclipse.m2m.tests.qvt.oml/org.eclipse.m2m.tests.qvt.oml.StandaloneTests.launch
index dd2df39..da8c2a2 100644
--- a/tests/org.eclipse.m2m.tests.qvt.oml/org.eclipse.m2m.tests.qvt.oml.StandaloneTests.launch
+++ b/tests/org.eclipse.m2m.tests.qvt.oml/org.eclipse.m2m.tests.qvt.oml.StandaloneTests.launch
@@ -14,7 +14,7 @@
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
- <listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5" javaProject="org.eclipse.m2m.tests.qvt.oml" path="1" type="4"/> "/>
+ <listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8" javaProject="org.eclipse.m2m.tests.qvt.oml" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="org.eclipse.m2m.tests.qvt.oml"/> </runtimeClasspathEntry> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.eclipse.m2m.tests.qvt.oml/parserTestData" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.eclipse.m2m.tests.qvt.oml/parserTestData with%20whitespace" path="3" type="2"/> "/>
diff --git a/tests/org.eclipse.m2m.tests.qvt.oml/src/org/eclipse/m2m/tests/qvt/oml/util/TestUtil.java b/tests/org.eclipse.m2m.tests.qvt.oml/src/org/eclipse/m2m/tests/qvt/oml/util/TestUtil.java
index 513b57a..e790792 100644
--- a/tests/org.eclipse.m2m.tests.qvt.oml/src/org/eclipse/m2m/tests/qvt/oml/util/TestUtil.java
+++ b/tests/org.eclipse.m2m.tests.qvt.oml/src/org/eclipse/m2m/tests/qvt/oml/util/TestUtil.java
@@ -257,10 +257,12 @@
public static void deleteJavaFiles(final IProject project) throws CoreException {
IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
final List<IFile> filesToDelete = new ArrayList<IFile>();
project.accept(new IResourceVisitor() {
+ @Override
public boolean visit(final IResource resource) {
if(resource.getType() == IResource.FILE) {
String extension = resource.getFileExtension();
@@ -397,7 +399,7 @@
return resSet;
}
-
+
public static void prepareJava(TestProject myProject, File destFolder, List<URI> metamodels, ResourceSet resSet) throws CoreException {
IPath destPath = new Path(destFolder.getPath());
@@ -407,50 +409,50 @@
destPath = destPath.makeRelativeTo(workspacePath).makeAbsolute();
IPath srcPath = destPath.append("src"); //$NON-NLS-1$
-
+
if (workspace.getRoot().exists(srcPath)) {
IProjectDescription desc = myProject.getProject().getDescription();
NatureUtils.addNature(desc, JavaCore.NATURE_ID);
-
+
IProgressMonitor monitor = new NullProgressMonitor();
-
+
myProject.getProject().setDescription(desc, monitor);
IJavaProject javaProject = JavaCore.create(myProject.getProject());
-
- javaProject.setOption(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_1_5);
-
-
+
+ javaProject.setOption(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_1_8);
+
+
IPath binPath = destPath.append("bin"); //$NON-NLS-1$
-
+
if (workspace.getRoot().exists(binPath)) {
javaProject.setOutputLocation(binPath, monitor);
}
-
+
List<IClasspathEntry> classpath = new ArrayList<IClasspathEntry>(3);
-
+
IClasspathAttribute testAttribute = JavaCore.newClasspathAttribute(IClasspathAttribute.TEST, Boolean.toString(true));
classpath.add(JavaCore.newSourceEntry(srcPath, new IPath[] {}, new IPath[] {}, null, new IClasspathAttribute[] {testAttribute}));
-
- classpath.add(JavaRuntime.getDefaultJREContainerEntry());
+
+ classpath.add(JavaRuntime.getDefaultJREContainerEntry());
classpath.add(ClasspathComputer.createContainerEntry());
-
+
IClasspathEntry[] entries = classpath.toArray(new IClasspathEntry[classpath.size()]);
-
+
assertFalse(javaProject.hasClasspathCycle(entries));
IJavaModelStatus status = JavaConventions.validateClasspath(javaProject, entries, javaProject.getOutputLocation());
assertTrue(status.isOK());
javaProject.setRawClasspath(entries, monitor);
-
+
setupPluginXml(myProject, destFolder, metamodels, resSet);
-
+
JavaCore.rebuildIndex(null);
-
- TestUtil.buildProject(myProject.getProject());
+
+ TestUtil.buildProject(myProject.getProject());
}
}
-
+
private static void setupPluginXml(TestProject myProject, File destFolder, List<URI> metamodels, ResourceSet resSet) throws CoreException {
IWorkspace workspace = myProject.getProject().getWorkspace();
@@ -494,10 +496,10 @@
resSet.getURIConverter().getURIMap().put(platformUri, fileUri);
}
}
-
+
IPluginImport qvtImport = pluginModel.createImport(QvtPlugin.ID);
pluginBase.add(qvtImport);
-
+
IPluginImport qvtSamplesImport = pluginModel.createImport(QVTSamplesPlugin.ID);
pluginBase.add(qvtSamplesImport);
@@ -505,9 +507,9 @@
pluginModel.save();
}
}
-
+
public static void disposeJava(TestProject project) throws CoreException {
-
+
IJavaProject javaProject = JavaCore.create(project.getProject());
if (javaProject.exists()) {
IProgressMonitor monitor = new NullProgressMonitor();
@@ -517,10 +519,10 @@
NatureUtils.removeNature(desc, JavaCore.NATURE_ID);
project.getProject().setDescription(desc, monitor);
}
-
+
IFile pluginXml = PDEProject.getPluginXml(project.getProject());
IFile manifest = PDEProject.getManifest(project.getProject());
-
+
pluginXml.delete(true, null);
manifest.delete(true, null);
}
