diff options
| author | Eugen Neufeld | 2018-12-04 09:37:06 +0000 |
|---|---|---|
| committer | Eugen Neufeld | 2018-12-04 09:37:06 +0000 |
| commit | 263755e7e3cef0018229793c12cd382ee6932544 (patch) | |
| tree | 39d663ab315ea56696603f988b8fdebe98d93d83 /bundles/org.eclipse.emf.ecp.common | |
| parent | 7e42fc8e82a1de73f2e761701eada0a455fe368e (diff) | |
| parent | 39b058d6b562a445bf9ab1ea1accc3fd8318e636 (diff) | |
| download | org.eclipse.emf.ecp.core-263755e7e3cef0018229793c12cd382ee6932544.tar.gz org.eclipse.emf.ecp.core-263755e7e3cef0018229793c12cd382ee6932544.tar.xz org.eclipse.emf.ecp.core-263755e7e3cef0018229793c12cd382ee6932544.zip | |
Merge remote-tracking branch 'origin/release_1.19.0' into develop
Change-Id: I4a4594db1b04cd746ca6e040f93b99591ffb1058
Diffstat (limited to 'bundles/org.eclipse.emf.ecp.common')
3 files changed, 5 insertions, 5 deletions
diff --git a/bundles/org.eclipse.emf.ecp.common/.classpath b/bundles/org.eclipse.emf.ecp.common/.classpath index ad32c83a78..eca7bdba8f 100644 --- a/bundles/org.eclipse.emf.ecp.common/.classpath +++ b/bundles/org.eclipse.emf.ecp.common/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.emf.ecp.common/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.emf.ecp.common/.settings/org.eclipse.jdt.core.prefs index 26d14e4fb8..23a98ed62e 100644 --- a/bundles/org.eclipse.emf.ecp.common/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.emf.ecp.common/.settings/org.eclipse.jdt.core.prefs @@ -25,9 +25,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -130,7 +130,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
diff --git a/bundles/org.eclipse.emf.ecp.common/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.common/META-INF/MANIFEST.MF index d2f350cc19..6f52c7c3c0 100644 --- a/bundles/org.eclipse.emf.ecp.common/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.emf.ecp.common/META-INF/MANIFEST.MF @@ -9,6 +9,6 @@ Export-Package: org.eclipse.emf.ecp.common.spi;version="1.19.0", org.eclipse.emf.ecp.common.spi.cachetree;version="1.19.0" Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)", org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.emf.ecp.common |