You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2015/09/16 19:59:03 UTC

[03/15] incubator-freemarker git commit: Eclipse project files update to use Java 6 (the Ant build will still catch non-Java-5 calls where they aren't allowed)

Eclipse project files update to use Java 6 (the Ant build will still catch non-Java-5 calls where they aren't allowed)


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/01552a9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/01552a9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/01552a9c

Branch: refs/heads/2.3
Commit: 01552a9c2968c01be09eef9880564a0e1723bf92
Parents: 2daf5f3
Author: ddekany <dd...@apache.org>
Authored: Mon Sep 14 02:24:43 2015 +0200
Committer: ddekany <dd...@apache.org>
Committed: Mon Sep 14 02:24:43 2015 +0200

----------------------------------------------------------------------
 .classpath                           | 2 +-
 .settings/org.eclipse.jdt.core.prefs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/01552a9c/.classpath
----------------------------------------------------------------------
diff --git a/.classpath b/.classpath
index ad83438..6ca1ecd 100644
--- a/.classpath
+++ b/.classpath
@@ -9,7 +9,7 @@
 			<attribute name="ignore_optional_problems" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry exported="true" kind="lib" path="ide-dependencies/annotations-3.0.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="ide-dependencies/ant-1.6.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="ide-dependencies/avalon-logkit-2.0.jar"/>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/01552a9c/.settings/org.eclipse.jdt.core.prefs
----------------------------------------------------------------------
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 7259bb5..e0e730a 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -17,9 +17,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 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.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+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
@@ -122,7 +122,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.5
+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_annotation=16