Author: sebb
Date: Fri Aug 14 16:49:16 2009
New Revision: 804292

URL: http://svn.apache.org/viewvc?rev=804292&view=rev
Log:
Start move to Java 1.5

Modified:
    jakarta/jmeter/trunk/build.xml

Modified: jakarta/jmeter/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=804292&r1=804291&r2=804292&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Fri Aug 14 16:49:16 2009
@@ -281,8 +281,8 @@
   <!-- Compilation parameters -->
   <property name="optimize" value="on"/>
   <property name="deprecation" value="off"/>
-  <property name="target.java.version" value="1.4"/>
-  <property name="src.java.version" value="1.4"/>
+  <property name="target.java.version" value="1.5"/>
+  <property name="src.java.version" value="1.5"/>
   <property name="encoding" value="UTF-8"/>
 
   <!-- 3rd party libraries to be included in the binary distribution -->
@@ -408,7 +408,7 @@
         JMeter version
         This is overridden for formal releases.
     -->
-    <property name="jmeter.version" value="2.3.4.${DSTAMP}"/>
+    <property name="jmeter.version" value="2.5.${DSTAMP}"/>
     <!-- Remember to change "docversion" below if necessary -->
     <condition property="implementation.version" 
           value="${jmeter.version} r${svn.revision}" else="${jmeter.version}">
@@ -421,7 +421,7 @@
   </target>
 
   <!-- JMeter Javadoc version (own variable is used so can be overriden 
independently) -->
-  <property name="docversion" value="2.3.4"/>
+  <property name="docversion" value="${jmeter.version}"/>
 
     <!-- Get version from SVN status -->
   <target name="init-svnVersion" depends="svnCheck">
@@ -1511,7 +1511,7 @@
       packagenames="org.apache.jmeter.*,org.apache.jorphan.*"
       excludepackagenames="org.apache.jorphan.timer">
       <classpath refid="classpath"/>
-      <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
+      <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
     </javadoc>
   </target>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org

Reply via email to