You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2015/12/11 21:14:19 UTC

svn commit: r1719527 - in /jmeter/trunk/extras: addons.txt addons.xml

Author: pmouawad
Date: Fri Dec 11 20:14:18 2015
New Revision: 1719527

URL: http://svn.apache.org/viewvc?rev=1719527&view=rev
Log:
Fix addons.xml to use Java7 and documentations

Modified:
    jmeter/trunk/extras/addons.txt
    jmeter/trunk/extras/addons.xml

Modified: jmeter/trunk/extras/addons.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/extras/addons.txt?rev=1719527&r1=1719526&r2=1719527&view=diff
==============================================================================
--- jmeter/trunk/extras/addons.txt (original)
+++ jmeter/trunk/extras/addons.txt Fri Dec 11 20:14:18 2015
@@ -10,7 +10,7 @@ Copy addons.xml into JMETER_HOME
 
 To build the addons, run ant as follows:
 
-ant -buildfile=addons.xml
+ant -buildfile addons.xml
 
 This will compile the sources to build/addons/...
 

Modified: jmeter/trunk/extras/addons.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/extras/addons.xml?rev=1719527&r1=1719526&r2=1719527&view=diff
==============================================================================
--- jmeter/trunk/extras/addons.xml (original)
+++ jmeter/trunk/extras/addons.xml Fri Dec 11 20:14:18 2015
@@ -30,7 +30,8 @@
   <!-- Compilation parameters -->
   <property name="optimize" value="on"/>
   <property name="deprecation" value="off"/>
-  <property name="target.java.version" value="1.2"/>
+  <property name="target.java.version" value="1.7"/>
+  <property name="src.java.version" value="1.7"/>
   <property name="encoding" value="UTF-8"/>
 
   <!-- Directory where the 3rd party libraries will live -->
@@ -44,7 +45,10 @@
 
   <target name="compile" description="Compile JMeter addons classes.">
     <mkdir dir="${build.addons}"/>
-    <javac srcdir="${src.addons}" destdir="${build.addons}" optimize="${optimize}" debug="on" target="${target.java.version}" deprecation="${deprecation}" encoding="${encoding}">
+    <javac srcdir="${src.addons}" destdir="${build.addons}" optimize="${optimize}" 
+    	includeantruntime="false"
+    	source="${target.java.version}"
+    	debug="on" target="${target.java.version}" deprecation="${deprecation}" encoding="${encoding}">
       <include name="**/*.java"/>
       <classpath refid="classpath"/>
     </javac>