diff options
author | Alexander Kurtakov | 2021-04-24 19:44:00 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2021-04-24 19:56:37 +0000 |
commit | 3fc5734033f2226d455960f170236b91eb68ad87 (patch) | |
tree | d894339c123198d3899eb069182f53bbf0bf2e80 | |
parent | 4cafab6c0a6d605c9dce5f9e51f77532a4b682d1 (diff) | |
download | eclipse.platform.team-3fc5734033f2226d455960f170236b91eb68ad87.tar.gz eclipse.platform.team-3fc5734033f2226d455960f170236b91eb68ad87.tar.xz eclipse.platform.team-3fc5734033f2226d455960f170236b91eb68ad87.zip |
Bug 573138 - Move bundles with deps on Java 11 to it too
Move o.e.compare.examples.
Change-Id: Ie16d07c980bac3506bd2e019257a5e11f77c8ae0
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.team/+/179797
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
4 files changed, 11 insertions, 8 deletions
diff --git a/examples/org.eclipse.compare.examples/.classpath b/examples/org.eclipse.compare.examples/.classpath index 01836c484..e801ebfb4 100644 --- a/examples/org.eclipse.compare.examples/.classpath +++ b/examples/org.eclipse.compare.examples/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/examples/org.eclipse.compare.examples/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.compare.examples/.settings/org.eclipse.jdt.core.prefs index 2f635f468..035f3d5a5 100644 --- a/examples/org.eclipse.compare.examples/.settings/org.eclipse.jdt.core.prefs +++ b/examples/org.eclipse.compare.examples/.settings/org.eclipse.jdt.core.prefs @@ -8,9 +8,9 @@ org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -21,6 +21,7 @@ org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fieldHiding=warning org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore @@ -48,6 +49,7 @@ org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore @@ -65,6 +67,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF index 6e7f6cc07..d9756e056 100644 --- a/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.compare.examples; singleton:=true -Bundle-Version: 3.2.500.qualifier +Bundle-Version: 3.3.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.compare.examples.structurecreator @@ -12,5 +12,5 @@ Require-Bundle: org.eclipse.ui, org.eclipse.jface.text, org.eclipse.core.runtime Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: org.eclipse.compare.examples diff --git a/examples/org.eclipse.compare.examples/pom.xml b/examples/org.eclipse.compare.examples/pom.xml index c3fb0007c..4e16b98f3 100644 --- a/examples/org.eclipse.compare.examples/pom.xml +++ b/examples/org.eclipse.compare.examples/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.compare</groupId> <artifactId>org.eclipse.compare.examples</artifactId> - <version>3.2.500-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> |