Revision: 19200
http://sourceforge.net/p/gate/code/19200
Author: markagreenwood
Date: 2016-04-05 18:35:36 +0000 (Tue, 05 Apr 2016)
Log Message:
-----------
moved to java 8
Modified Paths:
--------------
gate/branches/sawdust2/.classpath
gate/branches/sawdust2/.settings/org.eclipse.jdt.core.prefs
gate/branches/sawdust2/build.xml
Modified: gate/branches/sawdust2/.classpath
===================================================================
--- gate/branches/sawdust2/.classpath 2016-04-05 18:07:35 UTC (rev 19199)
+++ gate/branches/sawdust2/.classpath 2016-04-05 18:35:36 UTC (rev 19200)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry exported="true" kind="con"
path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=GATE&ivyXmlPath=ivy.xml&confs=*"/>
<classpathentry kind="output" path="classes/main"/>
</classpath>
Modified: gate/branches/sawdust2/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- gate/branches/sawdust2/.settings/org.eclipse.jdt.core.prefs 2016-04-05
18:07:35 UTC (rev 19199)
+++ gate/branches/sawdust2/.settings/org.eclipse.jdt.core.prefs 2016-04-05
18:35:36 UTC (rev 19200)
@@ -7,9 +7,9 @@
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.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+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
@@ -97,7 +97,7 @@
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
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=0
Modified: gate/branches/sawdust2/build.xml
===================================================================
--- gate/branches/sawdust2/build.xml 2016-04-05 18:07:35 UTC (rev 19199)
+++ gate/branches/sawdust2/build.xml 2016-04-05 18:35:36 UTC (rev 19200)
@@ -256,7 +256,7 @@
<!-- This target compiles all the classes -->
<target name="compile" depends="prepare, depend, svg2java"
description="compile the source ">
<!-- Compile the java code from ${srcDir} into ${buildDir} -->
- <javac srcdir="${srcDir}" destdir="${outputDir}" source="1.7" target="1.7"
encoding="UTF-8" debug="true" deprecation="${deprecation}"
debuglevel="lines,source" includes="gate/**,com/**,hepple/**"
classpathref="build.class.path">
+ <javac srcdir="${srcDir}" destdir="${outputDir}" source="1.8" target="1.8"
encoding="UTF-8" debug="true" deprecation="${deprecation}"
debuglevel="lines,source" includes="gate/**,com/**,hepple/**"
classpathref="build.class.path">
<compilerarg value="-Xmaxwarns" />
<compilerarg value="${gate.compile.maxwarnings}" />
<compilerarg value="-Xlint:all" />
@@ -266,7 +266,7 @@
<!-- This target compiles all the classes including debug information -->
<target name="compile_debug" depends="prepare, depend" description="compile
the source ">
<!-- Compile the java code from ${srcDir} into ${buildDir} -->
- <javac srcdir="${srcDir}" destdir="${outputDir}" encoding="UTF-8"
source="1.7" target="1.7" debug="true" deprecation="${deprecation}"
includes="gate/**,com/**,hepple/**" classpathref="build.class.path" />
+ <javac srcdir="${srcDir}" destdir="${outputDir}" encoding="UTF-8"
source="1.8" target="1.8" debug="true" deprecation="${deprecation}"
includes="gate/**,com/**,hepple/**" classpathref="build.class.path" />
</target>
@@ -455,9 +455,9 @@
</target>
<target name="javadoc.core" depends="java2html.taskdef">
- <javadoc access="protected" destdir="${docDir}/javadoc"
classpathref="run.class.path" Encoding="UTF-8" Use="yes" Windowtitle="GATE
JavaDoc" docencoding="UTF-8" charset="UTF-8" source="1.7" useexternalfile="yes"
breakiterator="true" linksource="yes" >
+ <javadoc access="protected" destdir="${docDir}/javadoc"
classpathref="run.class.path" Encoding="UTF-8" Use="yes" Windowtitle="GATE
JavaDoc" docencoding="UTF-8" charset="UTF-8" source="1.8" useexternalfile="yes"
breakiterator="true" linksource="yes" >
<fileset dir="${srcDir}" includes="**/*.java"
excludes="gate/resources/**" />
- <link href="http://docs.oracle.com/javase/7/docs/api/"; />
+ <link href="http://docs.oracle.com/javase/8/docs/api/"; />
</javadoc>
<!-- Now replace the ugly Java-html files with a better version -->
<delete dir="${docDir}/javadoc/src-html" />
@@ -466,7 +466,7 @@
<!-- Make documentation - internal -->
<target name="internaljavadoc" depends="java2html.taskdef">
- <javadoc access="private" destdir="${docDir}/javadoc/internal"
classpathref="run.class.path" Encoding="UTF-8" Use="yes" Windowtitle="GATE
JavaDoc (including private members)"
link="http://docs.oracle.com/javase/7/docs/api/"; docencoding="UTF-8"
charset="UTF-8" source="1.7" useexternalfile="yes" breakiterator="true"
linksource="yes" >
+ <javadoc access="private" destdir="${docDir}/javadoc/internal"
classpathref="run.class.path" Encoding="UTF-8" Use="yes" Windowtitle="GATE
JavaDoc (including private members)"
link="http://docs.oracle.com/javase/8/docs/api/"; docencoding="UTF-8"
charset="UTF-8" source="1.8" useexternalfile="yes" breakiterator="true"
linksource="yes" >
<fileset dir="${srcDir}" includes="**/*.java"
excludes="gate/resources/**" />
</javadoc>
<delete dir="${docDir}/javadoc/internal/src-html" />
@@ -509,7 +509,7 @@
<target name="prepare.tests" depends="jar">
<mkdir dir="${tests.outputDir}"/>
- <javac srcdir="${tests.srcDir}" destdir="${tests.outputDir}" source="1.7"
target="1.7" encoding="UTF-8" debug="true" deprecation="${deprecation}"
debuglevel="lines,source" classpathref="run.class.path">
+ <javac srcdir="${tests.srcDir}" destdir="${tests.outputDir}" source="1.8"
target="1.8" encoding="UTF-8" debug="true" deprecation="${deprecation}"
debuglevel="lines,source" classpathref="run.class.path">
<compilerarg value="-Xmaxwarns" />
<compilerarg value="${gate.compile.maxwarnings}" />
</javac>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
