You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2013/07/18 13:59:54 UTC
svn commit: r1504444 - in /jmeter/trunk: build.properties build.xml
res/maven/ApacheJMeter_parent.pom
Author: sebb
Date: Thu Jul 18 11:59:53 2013
New Revision: 1504444
URL: http://svn.apache.org/r1504444
Log:
Rename some properties to agree with jar name
Modified:
jmeter/trunk/build.properties
jmeter/trunk/build.xml
jmeter/trunk/res/maven/ApacheJMeter_parent.pom
Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1504444&r1=1504443&r2=1504444&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Thu Jul 18 11:59:53 2013
@@ -185,10 +185,10 @@ jdom.jar = jdom-${jdo
jdom.loc = ${maven2.repo}/org/jdom/jdom/${jdom.version}
jdom.md5 = 140bfed13341fe2039eee0f26a16d705
-js_rhino.version = 1.7R4
-js_rhino.jar = rhino-${js_rhino.version}.jar
-js_rhino.loc = ${maven2.repo}/org/mozilla/rhino/${js_rhino.version}
-js_rhino.md5 = 3850097fb5c9aa1065cc198f1b82dcf1
+rhino.version = 1.7R4
+rhino.jar = rhino-${rhino.version}.jar
+rhino.loc = ${maven2.repo}/org/mozilla/rhino/${rhino.version}
+rhino.md5 = 3850097fb5c9aa1065cc198f1b82dcf1
jodd-core.version = 3.4.4
jodd-core.jar = jodd-core-${jodd-core.version}.jar
@@ -236,10 +236,10 @@ soap.jar = soap-${soa
soap.loc = ${maven2.repo}/soap/soap/${soap.version}
soap.md5 = AA1845E01FEE94FE4A63BBCAA55AD486
-tidy.version = r938
-tidy.jar = jtidy-${tidy.version}.jar
-tidy.loc = ${maven2.repo}/net/sf/jtidy/jtidy/${tidy.version}
-tidy.md5 = 6A9121561B8F98C0A8FB9B6E57F50E6B
+jtidy.version = r938
+jtidy.jar = jtidy-${jtidy.version}.jar
+jtidy.loc = ${maven2.repo}/net/sf/jtidy/jtidy/${jtidy.version}
+jtidy.md5 = 6A9121561B8F98C0A8FB9B6E57F50E6B
# Apache Tika to extract text from various documents
tika-core.version = 1.4
Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1504444&r1=1504443&r2=1504444&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Thu Jul 18 11:59:53 2013
@@ -380,7 +380,7 @@
<include name="${lib.dir}/${jcharts.jar}"/>
<include name="${lib.dir}/${jdom.jar}"/>
<include name="${lib.dir}/${jms.jar}"/>
- <include name="${lib.dir}/${js_rhino.jar}"/>
+ <include name="${lib.dir}/${rhino.jar}"/>
<include name="${lib.dir}/${jodd-core.jar}"/>
<include name="${lib.dir}/${jodd-lagarto.jar}"/>
<include name="${lib.dir}/${jsoup.jar}"/>
@@ -391,7 +391,7 @@
<include name="${lib.dir}/${serializer.jar}"/>
<include name="${lib.dir}/${slf4j-api.jar}"/>
<include name="${lib.dir}/${soap.jar}"/>
- <include name="${lib.dir}/${tidy.jar}"/>
+ <include name="${lib.dir}/${jtidy.jar}"/>
<include name="${lib.dir}/${tika-core.jar}"/>
<include name="${lib.dir}/${tika-parsers.jar}"/>
<include name="${lib.dir}/${xalan.jar}"/>
@@ -448,7 +448,7 @@
<pathelement location="${lib.dir}/${jcharts.jar}"/>
<pathelement location="${lib.dir}/${jdom.jar}"/>
<pathelement location="${lib.dir}/${jms.jar}"/>
- <pathelement location="${lib.dir}/${js_rhino.jar}"/>
+ <pathelement location="${lib.dir}/${rhino.jar}"/>
<pathelement location="${lib.dir}/${jodd-core.jar}"/>
<pathelement location="${lib.dir}/${jodd-lagarto.jar}"/>
<pathelement location="${lib.dir}/${jsoup.jar}"/>
@@ -459,7 +459,7 @@
<pathelement location="${lib.dir}/${serializer.jar}"/>
<pathelement location="${lib.dir}/${slf4j-api.jar}"/>
<pathelement location="${lib.dir}/${soap.jar}"/>
- <pathelement location="${lib.dir}/${tidy.jar}"/>
+ <pathelement location="${lib.dir}/${jtidy.jar}"/>
<pathelement location="${lib.dir}/${tika-core.jar}"/>
<pathelement location="${lib.dir}/${tika-parsers.jar}"/>
<pathelement location="${lib.dir}/${xalan.jar}"/>
@@ -2877,7 +2877,7 @@ run JMeter unless all the JMeter jars ar
<process_jarfile jarname="jcharts"/>
<process_jarfile jarname="jdom"/>
<process_jarfile jarname="jms"/>
- <process_jarfile jarname="js_rhino"/>
+ <process_jarfile jarname="rhino"/>
<process_jarfile jarname="jodd-core"/>
<process_jarfile jarname="jodd-lagarto"/>
<process_jarfile jarname="jsoup"/>
@@ -2887,7 +2887,7 @@ run JMeter unless all the JMeter jars ar
<process_jarfile jarname="serializer"/>
<process_jarfile jarname="slf4j-api"/>
<process_jarfile jarname="soap"/>
- <process_jarfile jarname="tidy"/>
+ <process_jarfile jarname="jtidy"/>
<process_jarfile jarname="tika-core"/>
<process_jarfile jarname="tika-parsers"/>
<process_jarfile jarname="velocity" dest.dir="${lib.doc}"/>
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1504444&r1=1504443&r2=1504444&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Thu Jul 18 11:59:53 2013
@@ -77,16 +77,17 @@ under the License.
<jakarta-oro.version>2.0.8</jakarta-oro.version>
<jcharts.version>0.7.5</jcharts.version>
<jdom.version>1.1.3</jdom.version>
- <jodd.version>3.4.4</jodd.version>
+ <jodd-core.version>3.4.4</jodd-core.version>
+ <jodd-lagarto.version>3.4.4</jodd-lagarto.version>
<jsoup.version>1.7.2</jsoup.version>
- <js_rhino.version>1.7R4</js_rhino.version>
+ <rhino.version>1.7R4</rhino.version>
<junit.version>4.11</junit.version>
<logkit.version>2.0</logkit.version>
<mongo-java-driver.version>2.11.2</mongo-java-driver.version>
<rsyntaxtextarea.version>2.0.7</rsyntaxtextarea.version>
<slf4j-api.version>1.7.5</slf4j-api.version>
<soap.version>2.3.1</soap.version>
- <tidy.version>r938</tidy.version>
+ <jtidy.version>r938</jtidy.version>
<tika-core.version>1.4</tika-core.version>
<tika-parsers.version>1.4</tika-parsers.version>
<xmlpull.version>1.1.3.1</xmlpull.version>
@@ -248,7 +249,7 @@ under the License.
<dependency>
<groupId>org.mozilla</groupId>
<artifactId>rhino</artifactId>
- <version>${js_rhino.version}</version>
+ <version>${rhino.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -268,7 +269,7 @@ under the License.
<dependency>
<groupId>net.sf.jtidy</groupId>
<artifactId>jtidy</artifactId>
- <version>${tidy.version}</version>
+ <version>${jtidy.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
@@ -338,12 +339,12 @@ under the License.
<dependency>
<groupId>org.jodd</groupId>
<artifactId>jodd-core</artifactId>
- <version>${jodd.version}</version>
+ <version>${jodd-core.version}</version>
</dependency>
<dependency>
<groupId>org.jodd</groupId>
<artifactId>jodd-lagarto</artifactId>
- <version>${jodd.version}</version>
+ <version>${jodd-lagarto.version}</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>