Author: pmouawad Date: Sun Jun 3 19:29:35 2018 New Revision: 1832786 URL: http://svn.apache.org/viewvc?rev=1832786&view=rev Log: Bug 60991 - XPath Extractor : Implement XPath 2.0
Fix failures on jars versions testing Bugzilla Id: 60991 Modified: jmeter/trunk/build.properties jmeter/trunk/build.xml jmeter/trunk/res/maven/ApacheJMeter_parent.pom jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java Modified: jmeter/trunk/build.properties URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1832786&r1=1832785&r2=1832786&view=diff ============================================================================== --- jmeter/trunk/build.properties (original) +++ jmeter/trunk/build.properties Sun Jun 3 19:29:35 2018 @@ -474,10 +474,10 @@ activemq-all.loc = ${maven2. activemq-all.md5 = bd24ae082be11dc969a6e5bc45515ab7 # Used by XPath 2 -saxon-HE.version = 9.8.0-12 -saxon-HE.jar = Saxon-HE-${saxon-HE.version}.jar -saxon-HE.loc = ${maven2.repo}/net/sf/saxon/Saxon-HE/${saxon-HE.version} -saxon-HE.md5 = 80e040add296c6545b92d7cb1b648534 +Saxon-HE.version = 9.8.0-12 +Saxon-HE.jar = Saxon-HE-${Saxon-HE.version}.jar +Saxon-HE.loc = ${maven2.repo}/net/sf/saxon/Saxon-HE/${Saxon-HE.version} +Saxon-HE.md5 = 80e040add296c6545b92d7cb1b648534 # Optional for use by FTP_TESTS.jmx mina-core.version = 2.0.16 Modified: jmeter/trunk/build.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1832786&r1=1832785&r2=1832786&view=diff ============================================================================== --- jmeter/trunk/build.xml (original) +++ jmeter/trunk/build.xml Sun Jun 3 19:29:35 2018 @@ -446,7 +446,7 @@ <include name="${lib.dir}/${tika-core.jar}"/> <include name="${lib.dir}/${tika-parsers.jar}"/> <include name="${lib.dir}/${xalan.jar}"/> - <include name="${lib.dir}/${saxon-HE.jar}"/> + <include name="${lib.dir}/${Saxon-HE.jar}"/> <include name="${lib.dir}/${xerces.jar}"/> <include name="${lib.dir}/${xml-apis.jar}"/> <include name="${lib.dir}/${xmlgraphics-commons.jar}"/> @@ -533,7 +533,7 @@ <pathelement location="${lib.dir}/${tika-core.jar}"/> <pathelement location="${lib.dir}/${tika-parsers.jar}"/> <pathelement location="${lib.dir}/${xalan.jar}"/> - <pathelement location="${lib.dir}/${saxon-HE.jar}"/> + <pathelement location="${lib.dir}/${Saxon-HE.jar}"/> <pathelement location="${lib.dir}/${xerces.jar}"/> <pathelement location="${lib.dir}/${xml-apis.jar}"/> <pathelement location="${lib.dir}/${xmlgraphics-commons.jar}"/> @@ -3402,7 +3402,7 @@ run JMeter unless all the JMeter jars ar <process_jarfile jarname="velocity" dest.dir="${lib.doc}"/> <process_jarfile jarname="commons-lang" dest.dir="${lib.doc}"/> <process_jarfile jarname="xalan"/> - <process_jarfile jarname="saxon-HE"/> + <process_jarfile jarname="Saxon-HE"/> <process_jarfile jarname="xerces"/> <process_jarfile jarname="xml-apis"/> <process_jarfile jarname="xmlgraphics-commons"/> Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1832786&r1=1832785&r2=1832786&view=diff ============================================================================== --- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original) +++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Jun 3 19:29:35 2018 @@ -99,7 +99,7 @@ under the License. <ph-css.version>6.0.0</ph-css.version> <ph-commons.version>9.0.0</ph-commons.version> <rsyntaxtextarea.version>2.6.1</rsyntaxtextarea.version> - <saxon-HE.version>9.8.0-12</saxon-HE.version> + <Saxon-HE.version>9.8.0-12</Saxon-HE.version> <slf4j-api.version>1.7.25</slf4j-api.version> <slf4j-ext.version>1.7.25</slf4j-ext.version> <log4j-api.version>2.10.0</log4j-api.version> @@ -336,7 +336,7 @@ under the License. <dependency> <groupId>net.sf.saxon</groupId> <artifactId>Saxon-HE</artifactId> - <version>${saxon-HE.version}</version> + <version>${Saxon-HE.version}</version> </dependency> <dependency> <groupId>xerces</groupId> Modified: jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java?rev=1832786&r1=1832785&r2=1832786&view=diff ============================================================================== --- jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java (original) +++ jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java Sun Jun 3 19:29:35 2018 @@ -161,7 +161,10 @@ public class JMeterVersionTest extends J } else if (jar.equals("spock-core-1.0-groovy")) { // special handling jar = "spock-core"; version = "1.0-groovy-2.4"; - } else { + } else if (jar.equals("Saxon-HE-9.8.0")) { // special handling + jar = "Saxon-HE"; + version = "9.8.0-12"; + }else { String tmp = JAR_TO_BUILD_PROP.get(jar); if (tmp != null) { jar = tmp;