diff options
author | Lars Vogel | 2014-04-05 11:07:53 +0000 |
---|---|---|
committer | Lars Vogel | 2014-04-05 11:20:36 +0000 |
commit | 76c9ac74a169ac3f132e12a76d80d38e42d6136d (patch) | |
tree | 019f625b7bfacb524d00db141bc160ff958bc459 | |
parent | 3c1a170e38995cd19bcc7d1a64f92c0c281adec8 (diff) | |
download | eclipse.platform.runtime-76c9ac74a169ac3f132e12a76d80d38e42d6136d.tar.gz eclipse.platform.runtime-76c9ac74a169ac3f132e12a76d80d38e42d6136d.tar.xz eclipse.platform.runtime-76c9ac74a169ac3f132e12a76d80d38e42d6136d.zip |
Bug 432078 - Update org.eclipse.core.jobs to Java 1.6
Rebased onto origin/master
Change-Id: I057e0068a4199df83983279ac914dc5d6584b073
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
-rw-r--r-- | bundles/org.eclipse.core.jobs/.classpath | 2 | ||||
-rw-r--r-- | bundles/org.eclipse.core.jobs/.settings/org.eclipse.jdt.core.prefs | 23 | ||||
-rw-r--r-- | bundles/org.eclipse.core.jobs/META-INF/MANIFEST.MF | 3 | ||||
-rw-r--r-- | bundles/org.eclipse.core.jobs/pom.xml | 15 |
4 files changed, 32 insertions, 11 deletions
diff --git a/bundles/org.eclipse.core.jobs/.classpath b/bundles/org.eclipse.core.jobs/.classpath index 6f3b481ac..4c62a8048 100644 --- a/bundles/org.eclipse.core.jobs/.classpath +++ b/bundles/org.eclipse.core.jobs/.classpath @@ -1,7 +1,7 @@ <?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/CDC-1.1%Foundation-1.1"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.core.jobs/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.core.jobs/.settings/org.eclipse.jdt.core.prefs index e9d68a577..1bed897e5 100644 --- a/bundles/org.eclipse.core.jobs/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.core.jobs/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,15 @@ -#Mon Nov 23 09:24:20 EST 2009 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.compliance=1.4 +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.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deprecation=warning @@ -13,7 +17,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=warning @@ -78,7 +82,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -150,9 +154,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert diff --git a/bundles/org.eclipse.core.jobs/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.jobs/META-INF/MANIFEST.MF index 16b404452..1a3b47795 100644 --- a/bundles/org.eclipse.core.jobs/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.core.jobs/META-INF/MANIFEST.MF @@ -9,8 +9,7 @@ Export-Package: org.eclipse.core.internal.jobs;x-internal:=true, org.eclipse.core.runtime.jobs Bundle-Activator: org.eclipse.core.internal.jobs.JobActivator Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.2.0,4.0.0)" -Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, - J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Eclipse-LazyStart: true Import-Package: org.eclipse.osgi.service.debug, org.eclipse.osgi.util, diff --git a/bundles/org.eclipse.core.jobs/pom.xml b/bundles/org.eclipse.core.jobs/pom.xml index 6aa0e8a3c..1465ef8af 100644 --- a/bundles/org.eclipse.core.jobs/pom.xml +++ b/bundles/org.eclipse.core.jobs/pom.xml @@ -8,6 +8,7 @@ Contributors: Igor Fedorenko - initial implementation + Lars Vogel <Lars.Vogel@gmail.com> - Bug 432078 --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -21,4 +22,18 @@ <artifactId>org.eclipse.core.jobs</artifactId> <version>3.6.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-compiler-plugin</artifactId> + <version>${tycho.version}</version> + <configuration> + <compilerArgs> + <arg>-warn:-raw,unchecked</arg> + </compilerArgs> + </configuration> + </plugin> + </plugins> + </build> </project> |