Author: pmouawad
Date: Mon Feb 4 20:51:48 2019
New Revision: 1852945
URL: http://svn.apache.org/viewvc?rev=1852945&view=rev
Log:
Bug 63033 Updated to Saxon-HE 9.9.1-1 (from 9.8.0-12).
Thanks at Saxonica
Bugzilla Id: 63033
Modified:
jmeter/trunk/LICENSE
jmeter/trunk/build.properties
jmeter/trunk/eclipse.classpath
jmeter/trunk/lib/ (props changed)
jmeter/trunk/lib/aareadme.txt
jmeter/trunk/res/maven/ApacheJMeter_parent.pom
jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java
jmeter/trunk/test/src/org/apache/jmeter/util/XPathUtilTest.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/jmeter/trunk/LICENSE?rev=1852945&r1=1852944&r2=1852945&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Mon Feb 4 20:51:48 2019
@@ -287,4 +287,4 @@ For details, please see the files under:
* xpp3-1.1.4c.jar (Indiana University Extreme! Lab Software License 1.1.1)
* xstream-1.4.11.jar (BSD)
* hamcrest-date-2.0.4.jar (BSD)
-* Saxon-HE-9.8.0-14.jar (Mozilla Public License version 2.0)
+* Saxon-HE-9.9.1-1.jar (Mozilla Public License version 2.0)
Modified: jmeter/trunk/build.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1852945&r1=1852944&r2=1852945&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Mon Feb 4 20:51:48 2019
@@ -487,10 +487,10 @@ activemq-all.loc = ${maven2.
activemq-all.sha512 =
5dda2a620ad6cacff743b29d4f2095c3f7454b0afef7ddf9da82994c6545ef58fd6a6cb558e862851ab60acccb890b9dd11874007558bab82f690d1af4a3f2a2
# Used by XPath 2
-Saxon-HE.version = 9.8.0-14
+Saxon-HE.version = 9.9.1-1
Saxon-HE.jar = Saxon-HE-${Saxon-HE.version}.jar
Saxon-HE.loc =
${maven2.repo}/net/sf/saxon/Saxon-HE/${Saxon-HE.version}
-Saxon-HE.sha512 =
CAFD0765FBCAD5B78915EB8AAAF7CFDE001FFC2A86955909FC0469167E6E91FCB98924F0AD410BA3B01FDF977514BFB83A723F1767B718275EBB9FA608189131
+Saxon-HE.sha512 =
DEED3B397975A8419C903B61A1FC54C1E3899506B6D8DD562425DFD776690C51A8BB5326B821AFA4892670F410688255506CB0BFEB8F7532B84914A11490CCB3
# Optional for use by FTP_TESTS.jmx
mina-core.version = 2.0.16
Modified: jmeter/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1852945&r1=1852944&r2=1852945&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Mon Feb 4 20:51:48 2019
@@ -101,7 +101,7 @@
<classpathentry kind="lib" path="lib/ph-commons-9.2.0.jar"/>
<classpathentry kind="lib" path="lib/rhino-1.7.10.jar"/>
<classpathentry kind="lib" path="lib/rsyntaxtextarea-3.0.2.jar"/>
- <classpathentry kind="lib" path="lib/Saxon-HE-9.8.0-14.jar"/>
+ <classpathentry kind="lib" path="lib/Saxon-HE-9.9.1-1.jar"/>
<classpathentry kind="lib" path="lib/serializer-2.7.2.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.25.jar"/>
<classpathentry kind="lib" path="lib/tika-core-1.20.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 4 20:51:48 2019
@@ -63,7 +63,7 @@ rsyntaxtextarea-3.0.2.jar
objenesis-2.6.jar
oro-2.0.8.jar
rhino-1.7.10.jar
-Saxon-HE-9.8.0-14.jar
+Saxon-HE-9.9.1-1.jar
serializer-2.7.2.jar
slf4j-api-1.7.25.jar
spock-core-1.0-groovy-2.4.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1852945&r1=1852944&r2=1852945&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Mon Feb 4 20:51:48 2019
@@ -258,7 +258,7 @@ commons-dbcp2-2.5.0 (org.apache.commons.
--------------------------
- DataSourceElement (JDBC)
-Saxon-HE-9.8.0-14 (net.sf.saxon)
+Saxon-HE-9.9.1-1 (net.sf.saxon)
--------------------------
- XPath2Extractor (XML)
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL:
http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1852945&r1=1852944&r2=1852945&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Mon Feb 4 20:51:48 2019
@@ -103,7 +103,7 @@ under the License.
<ph-css.version>6.1.1</ph-css.version>
<ph-commons.version>9.2.0</ph-commons.version>
<rsyntaxtextarea.version>3.0.2</rsyntaxtextarea.version>
- <Saxon-HE.version>9.8.0-14</Saxon-HE.version>
+ <Saxon-HE.version>9.9.1-1</Saxon-HE.version>
<slf4j-api.version>1.7.25</slf4j-api.version>
<log4j-api.version>2.11.1</log4j-api.version>
<log4j-core.version>2.11.1</log4j-core.version>
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=1852945&r1=1852944&r2=1852945&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java Mon Feb 4
20:51:48 2019
@@ -164,7 +164,7 @@ public class JMeterVersionTest extends J
version = "1.0-groovy-2.4";
} else if (jar.equals("Saxon-HE-9.8.0")) { // special handling
jar = "Saxon-HE";
- version = "9.8.0-14";
+ version = "9.9.1-1";
}else {
String tmp = JAR_TO_BUILD_PROP.get(jar);
if (tmp != null) {
Modified: jmeter/trunk/test/src/org/apache/jmeter/util/XPathUtilTest.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/util/XPathUtilTest.java?rev=1852945&r1=1852944&r2=1852945&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/util/XPathUtilTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/util/XPathUtilTest.java Mon Feb 4
20:51:48 2019
@@ -22,17 +22,25 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertThat;
import java.io.PrintStream;
+import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.transform.stream.StreamSource;
import org.hamcrest.CoreMatchers;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import net.sf.saxon.s9api.Processor;
import net.sf.saxon.s9api.SaxonApiException;
+import net.sf.saxon.s9api.XPathCompiler;
+import net.sf.saxon.s9api.XPathExecutable;
+import net.sf.saxon.s9api.XPathSelector;
+import net.sf.saxon.s9api.XdmItem;
+import net.sf.saxon.s9api.XdmValue;
public class XPathUtilTest {
private static final Logger log = LoggerFactory.getLogger(XPathUtil.class);
@@ -41,6 +49,20 @@ public class XPathUtilTest {
final String xmlDoc =
JMeterUtils.getResourceFileAsText("XPathUtilTestXml.xml");
@Test
+ public void testBug63033() throws SaxonApiException {
+ Processor p = new Processor(false);
+ XPathCompiler c = p.newXPathCompiler();
+ c.declareNamespace("age", "http://www.w3.org/2003/01/geo/wgs84_pos#";);
+ String xPathQuery="//Employees/Employee[1]/age:ag";;
+ XPathExecutable e = c.compile(xPathQuery);
+ XPathSelector selector = e.load();
+ selector.setContextItem(p.newDocumentBuilder().build(new
StreamSource(new StringReader(xmlDoc))));
+ XdmValue nodes = selector.evaluate();
+ XdmItem item = nodes.itemAt(0);
+ assertEquals("<age:ag
xmlns:age=\"http://www.w3.org/2003/01/geo/wgs84_pos#\";>29</age:ag>",item.toString());
+ }
+
+ @Test
public void testputValuesForXPathInListUsingSaxon() throws
SaxonApiException, FactoryConfigurationError{
String xPathQuery="//Employees/Employee/role";
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1852945&r1=1852944&r2=1852945&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Mon Feb 4 20:51:48 2019
@@ -174,7 +174,7 @@ containing a fix to this issue, we decid
<li>Updated to ph-commons-9.2.0 (from ph-commons-9.1.2)</li>
<li>Updated to log4j-2.11.1 (from log4j-2.11.0)</li>
<li>Updated to xmlgraphics-commons 2.3 (from 2.2)</li>
- <li>Updated to Saxon-HE 9.8.0-14 (from 9.8.0-12)</li>
+ <li><bug>63033</bug>Updated to Saxon-HE 9.9.1-1 (from 9.8.0-12). Thanks at
Saxonica</li>
<li>Updated to xstream 1.4.11 (from 1.4.10)</li>
<li>Updated to jodd 5.0.6 (from 4.1.4)</li>
<li>Updated to asm-7.0 (from 6.1)</li>
@@ -289,6 +289,7 @@ containing a fix to this issue, we decid
<li>Sonali (arora.sonali99 at gmail.com)</li>
<li>Mohamed Ibrahim (rollno748 at gmail.com)</li>
<li>U. Poblotzki (u.poblotzki at thalia.de)</li>
+ <li><a href="https://www.saxonica.com";>Saxonica</a></li>
</ul>
<p>We also thank bug reporters who helped us improve JMeter.</p>
<ul>
