diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.properties | 1 | ||||
| -rw-r--r-- | build/build.xml | 16 | ||||
| -rw-r--r-- | build/javadoc/j2se-1.6.0/package-list (renamed from build/javadoc/j2se-1.5.0/package-list) | 39 |
3 files changed, 47 insertions, 9 deletions
diff --git a/build/build.properties b/build/build.properties index a1b285c952..0260cc54a9 100644 --- a/build/build.properties +++ b/build/build.properties @@ -4,6 +4,7 @@ product-file=vaadin product-name=Vaadin vaadin-package=com/vaadin gwt-dir=lib/core/gwt +required.java.version=1.6 # repository into which Maven snapshots should be published snapshot.repository.url=http://oss.sonatype.org/content/repositories/vaadin-snapshots diff --git a/build/build.xml b/build/build.xml index 93d95909c6..1df992cedd 100644 --- a/build/build.xml +++ b/build/build.xml @@ -150,11 +150,11 @@ <target name="check-java-version"> <condition property="java.version.matches"> <or> - <equals arg1="${ant.java.version}" arg2="1.5"/> + <equals arg1="${ant.java.version}" arg2="${required.java.version}"/> <isset property="ignoreversion"/> </or> </condition> - <fail unless="java.version.matches" message="Java version is ${ant.java.version}, but Vaadin must be compiled with genuine Java 1.5 compiler. Use -Dignoreversion=1 for ant to ignore the version check."/> + <fail unless="java.version.matches" message="Java version is ${ant.java.version}, but Vaadin must be compiled with genuine Java ${required.java.version} compiler. Use -Dignoreversion=1 for ant to ignore the version check."/> <echo>Java version is ${ant.java.version} as required.</echo> </target> @@ -162,7 +162,7 @@ <!-- Initialization - - - - - - - - - - - - - - - - - - - - - - - - - - --> <!-- ================================================================== --> - <target name="init" depends="init-deps, build.properties"> + <target name="init" depends="init-deps, build.properties, check-java-version"> <!-- Current timestamp in different formats. --> <tstamp> <format property="build.date" pattern="yyyy-MM-dd"/> @@ -490,7 +490,7 @@ <echo>Compiling src (server-side)</echo> <!-- Compile core sources first as the other sources depend on these --> <mkdir dir="${result-classes-core}" /> - <javac source="1.5" target="1.5" classpathref="compile.classpath.server-side" destdir="${result-classes-core}" debug="true" encoding="UTF-8" includeantruntime="false"> + <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server-side" destdir="${result-classes-core}" debug="true" encoding="UTF-8" includeantruntime="false"> <src path="${result-src-core}"/> </javac> </target> @@ -499,7 +499,7 @@ <echo>Compiling src (Server and client side JUnit tests)</echo> <!-- Compile server and client side JUnit tests --> <mkdir dir="${result-classes-junit}" /> - <javac source="1.5" target="1.5" classpathref="compile.classpath.server-side-tests" destdir="${result-classes-junit}" debug="true" encoding="UTF-8" includeantruntime="false"> + <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server-side-tests" destdir="${result-classes-junit}" debug="true" encoding="UTF-8" includeantruntime="false"> <classpath path="${result-classes-core}"></classpath> <src path="${result-src-junit}"/> </javac> @@ -507,7 +507,7 @@ <echo>Compiling src (TestBench tests)</echo> <!-- Compile TestBench tests --> <mkdir dir="${result-classes-testbench}" /> - <javac source="1.5" target="1.5" classpathref="compile.classpath.server-side" destdir="${result-classes-testbench}" debug="true" encoding="UTF-8" includeantruntime="false"> + <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server-side" destdir="${result-classes-testbench}" debug="true" encoding="UTF-8" includeantruntime="false"> <classpath path="${result-classes-junit}"></classpath> <classpath path="${result-classes-core}"></classpath> <src path="${result-src-testbench}"/> @@ -518,7 +518,7 @@ <target name="compile-helpers" depends="init"> <mkdir dir="${buildhelpers-classes}" /> <ivy:cachepath pathid="buildhelpers.dependencies" resolveId="buildhelpers" conf="compile" file="build/ivy/buildhelpers-ivy.xml"/> - <javac source="1.5" target="1.5" includeantruntime="false" srcdir="${buildhelpers-src}" + <javac source="${required.java.version}" target="${required.java.version}" includeantruntime="false" srcdir="${buildhelpers-src}" classpathref="buildhelpers.dependencies" destdir="${buildhelpers-classes}" debug="true" encoding="UTF-8" /> </target> @@ -878,7 +878,7 @@ <doctitle>${javadoc.doctitle}</doctitle> <!-- <header><![CDATA[<script type="text/javascript" src=".html-style/style.js"></script>]]></header> --> <bottom>${javadoc.bottom}</bottom> - <link offline="true" href="http://java.sun.com/j2se/1.5.0/docs/api/" packagelistLoc="build/javadoc/j2se-1.5.0" /> + <link offline="true" href="http://docs.oracle.com/javase/6/docs/api/" packagelistLoc="build/javadoc/j2se-1.6.0" /> <link offline="true" href="http://java.sun.com/j2ee/1.4/docs/api/" packagelistLoc="build/javadoc/j2ee-1.4" /> </javadoc> diff --git a/build/javadoc/j2se-1.5.0/package-list b/build/javadoc/j2se-1.6.0/package-list index 48783362ea..42c9b950ef 100644 --- a/build/javadoc/j2se-1.5.0/package-list +++ b/build/javadoc/j2se-1.6.0/package-list @@ -39,6 +39,7 @@ java.security.interfaces java.security.spec java.sql java.text +java.text.spi java.util java.util.concurrent java.util.concurrent.atomic @@ -47,9 +48,13 @@ java.util.jar java.util.logging java.util.prefs java.util.regex +java.util.spi java.util.zip javax.accessibility +javax.activation javax.activity +javax.annotation +javax.annotation.processing javax.crypto javax.crypto.interfaces javax.crypto.spec @@ -60,6 +65,12 @@ javax.imageio.plugins.bmp javax.imageio.plugins.jpeg javax.imageio.spi javax.imageio.stream +javax.jws +javax.jws.soap +javax.lang.model +javax.lang.model.element +javax.lang.model.type +javax.lang.model.util javax.management javax.management.loading javax.management.modelmbean @@ -83,6 +94,7 @@ javax.print.event javax.rmi javax.rmi.CORBA javax.rmi.ssl +javax.script javax.security.auth javax.security.auth.callback javax.security.auth.kerberos @@ -116,17 +128,42 @@ javax.swing.text.html.parser javax.swing.text.rtf javax.swing.tree javax.swing.undo +javax.tools javax.transaction javax.transaction.xa javax.xml +javax.xml.bind +javax.xml.bind.annotation +javax.xml.bind.annotation.adapters +javax.xml.bind.attachment +javax.xml.bind.helpers +javax.xml.bind.util +javax.xml.crypto +javax.xml.crypto.dom +javax.xml.crypto.dsig +javax.xml.crypto.dsig.dom +javax.xml.crypto.dsig.keyinfo +javax.xml.crypto.dsig.spec javax.xml.datatype javax.xml.namespace javax.xml.parsers +javax.xml.soap +javax.xml.stream +javax.xml.stream.events +javax.xml.stream.util javax.xml.transform javax.xml.transform.dom javax.xml.transform.sax +javax.xml.transform.stax javax.xml.transform.stream javax.xml.validation +javax.xml.ws +javax.xml.ws.handler +javax.xml.ws.handler.soap +javax.xml.ws.http +javax.xml.ws.soap +javax.xml.ws.spi +javax.xml.ws.wsaddressing javax.xml.xpath org.ietf.jgss org.omg.CORBA @@ -163,4 +200,4 @@ org.w3c.dom.events org.w3c.dom.ls org.xml.sax org.xml.sax.ext -org.xml.sax.helpers +org.xml.sax.helpers
\ No newline at end of file |