diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/VERSION.properties | 2 | ||||
| -rw-r--r-- | build/build.xml | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/build/VERSION.properties b/build/VERSION.properties index 97453c8cec..ebd5000546 100644 --- a/build/VERSION.properties +++ b/build/VERSION.properties @@ -1 +1 @@ -version=6.4.6 +version=6.5.0 diff --git a/build/build.xml b/build/build.xml index ff98813857..e7cad185aa 100644 --- a/build/build.xml +++ b/build/build.xml @@ -180,7 +180,6 @@ <!-- Construct classpath used by java and javadoc compilation --> <path id="compile.classpath"> <pathelement path="build/lib/servlet.jar" /> - <pathelement path="build/external/fileupload/classes" /> <fileset dir="lib/core"> <include name="**/*.jar"/> @@ -574,12 +573,7 @@ </copy> </target> - <target name="compile-fileupload"> - <echo>Compiling custom fileupload classes.</echo> - <ant dir="build/external/fileupload" antfile="build.xml" target="compile" /> - </target> - - <target name="compile-java" depends="init, check-servlet-version, compile-fileupload, webcontent"> + <target name="compile-java" depends="init, check-servlet-version, webcontent"> <echo>Compiling src (server-side)</echo> <!-- Compile all sources at the same time as they depend on each other --> @@ -798,10 +792,6 @@ <exclude name="${toolkit-package}/launcher/**" /> </patternset> </fileset> - <!-- fileupload, see build/external/fileupload/build.xml --> - <fileset dir="build/external/fileupload/classes"> - <include name="**/*" /> - </fileset> <!-- add sources --> <fileset dir="${result-path}/src/core"> <patternset> |