Meh, I was wrong in r841. Because the target version is 1.6, anything that tries to build against

depot with a 1.5 compiler is going to blow up with a mismatched version. Go back to 1.5 in build.xml
and pom.xml, but leave Eclipse using a 1.6 JVM. This means if anyone regenerates the m2eclipse
configuration, this will break in Eclipse again. Lame.
This commit is contained in:
Charlie Groves
2011-03-23 22:09:29 +00:00
parent 7129295906
commit 8d56a93538
3 changed files with 14 additions and 10 deletions
+4 -4
View File
@@ -1,6 +1,6 @@
#Wed Mar 23 12:51:22 PDT 2011 #Wed Mar 23 15:04:38 PDT 2011
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.compiler.source=1.5
+8 -4
View File
@@ -28,10 +28,12 @@
<taskdef name="grecord" classname="com.samskivert.depot.tools.GenRecordTask" <taskdef name="grecord" classname="com.samskivert.depot.tools.GenRecordTask"
classpathref="built.path"/> classpathref="built.path"/>
<!-- make sure the record class files are all compiled --> <!-- make sure the record class files are all compiled -->
<ooojavac destdir="${classes.dir}" classpathref="pom.xml.path" srcdir="${src.dir}"> <ooojavac destdir="${classes.dir}" classpathref="pom.xml.path" srcdir="${src.dir}"
version="1.5">
<include name="**/*Record.java"/> <include name="**/*Record.java"/>
</ooojavac> </ooojavac>
<ooojavac destdir="${tclasses.dir}" classpathref="pom.xml.path" srcdir="${test.dir}"> <ooojavac destdir="${tclasses.dir}" classpathref="pom.xml.path" srcdir="${test.dir}"
version="1.5">
<include name="**/*Record.java"/> <include name="**/*Record.java"/>
</ooojavac> </ooojavac>
<!-- now update the source files --> <!-- now update the source files -->
@@ -57,10 +59,12 @@
<copy todir="${classes.dir}"> <copy todir="${classes.dir}">
<fileset dir="src/main/resources" includes="**/*.tmpl"/> <fileset dir="src/main/resources" includes="**/*.tmpl"/>
</copy> </copy>
<ooojavac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="pom.xml.path"/> <ooojavac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="pom.xml.path"
version="1.5"/>
<mkdir dir="${tclasses.dir}"/> <mkdir dir="${tclasses.dir}"/>
<ooojavac srcdir="${test.dir}" destdir="${tclasses.dir}" classpathref="built.path"/> <ooojavac srcdir="${test.dir}" destdir="${tclasses.dir}" classpathref="built.path"
version="1.5"/>
</target> </target>
<target name="javadoc" depends="-prepare" description="Generates javadoc documentation."> <target name="javadoc" depends="-prepare" description="Generates javadoc documentation.">
+2 -2
View File
@@ -86,8 +86,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version> <version>2.3.2</version>
<configuration> <configuration>
<source>1.6</source> <source>1.5</source>
<target>1.6</target> <target>1.5</target>
<fork>true</fork> <fork>true</fork>
<showDeprecation>true</showDeprecation> <showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings> <showWarnings>true</showWarnings>