Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2021-07-23 09:25:02 +0000
committerAlexander Kurtakov2021-07-23 11:30:34 +0000
commiteb3172ba3ac299d9bae133020013dc98514ed8af (patch)
treed839bf8b6923aebb52aedc4ef66b0962e65e4614
parent6bf99952b677f8344ac8ed3cd8733f3181645844 (diff)
downloadrt.equinox.bundles-eb3172ba3ac299d9bae133020013dc98514ed8af.tar.gz
rt.equinox.bundles-eb3172ba3ac299d9bae133020013dc98514ed8af.tar.xz
rt.equinox.bundles-eb3172ba3ac299d9bae133020013dc98514ed8af.zip
Bug 574992 - Move bundles to Java 11 where needed in equinox.bundles
Move o.e.equinox.app Change-Id: I71b6f5e781c3aadd9e8442c711ce9413d27ac9f9 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com> Reviewed-on: https://git.eclipse.org/r/c/equinox/rt.equinox.bundles/+/183319 Tested-by: Equinox Bot <equinox-bot@eclipse.org>
-rw-r--r--bundles/org.eclipse.equinox.app/.classpath2
-rw-r--r--bundles/org.eclipse.equinox.app/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF4
-rw-r--r--bundles/org.eclipse.equinox.app/pom.xml2
4 files changed, 8 insertions, 8 deletions
diff --git a/bundles/org.eclipse.equinox.app/.classpath b/bundles/org.eclipse.equinox.app/.classpath
index e12689abf..a69a5a6ea 100644
--- a/bundles/org.eclipse.equinox.app/.classpath
+++ b/bundles/org.eclipse.equinox.app/.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.8"/>
+ <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="src" path="osgi">
<attributes>
diff --git a/bundles/org.eclipse.equinox.app/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.app/.settings/org.eclipse.jdt.core.prefs
index b0a8e5917..1e2171619 100644
--- a/bundles/org.eclipse.equinox.app/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.equinox.app/.settings/org.eclipse.jdt.core.prefs
@@ -17,9 +17,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
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
@@ -128,8 +128,8 @@ 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.release=disabled
-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.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF
index e453b258d..a8bb13c65 100644
--- a/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.app; singleton:=true
-Bundle-Version: 1.5.100.qualifier
+Bundle-Version: 1.6.0.qualifier
Bundle-Vendor: %providerName
Bundle-Activator: org.eclipse.equinox.internal.app.Activator
Bundle-Localization: plugin
@@ -28,5 +28,5 @@ Require-Bundle: org.eclipse.equinox.registry;bundle-version="[3.4.0,4.0.0)",
Comment-DynamicImport: this is only used to allow late binding of the package
DynamicImport-Package: org.osgi.service.event;version="1.0.0"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: org.eclipse.equinox.app
diff --git a/bundles/org.eclipse.equinox.app/pom.xml b/bundles/org.eclipse.equinox.app/pom.xml
index 9fcb7084f..ff51b459b 100644
--- a/bundles/org.eclipse.equinox.app/pom.xml
+++ b/bundles/org.eclipse.equinox.app/pom.xml
@@ -19,7 +19,7 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.app</artifactId>
- <version>1.5.100-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>

Back to the top