You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2019/07/14 13:02:32 UTC
[jmeter] branch master updated (4ecda65 -> b11e8b2)
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.
from 4ecda65 Close ctx in finally
new 137863c Add javadoc for throws tags
new b11e8b2 Revert "Don't call initSvn in ant run as we don't have subversion anymore."
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.xml | 4 ++--
src/core/org/apache/jmeter/util/XPathUtil.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
[jmeter] 01/02: Add javadoc for throws tags
Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 137863c15cab63129416a280f67f59b04b30c014
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sun Jul 14 14:43:49 2019 +0200
Add javadoc for throws tags
---
src/core/org/apache/jmeter/util/XPathUtil.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/core/org/apache/jmeter/util/XPathUtil.java b/src/core/org/apache/jmeter/util/XPathUtil.java
index 520af54..6376c4c 100644
--- a/src/core/org/apache/jmeter/util/XPathUtil.java
+++ b/src/core/org/apache/jmeter/util/XPathUtil.java
@@ -679,8 +679,8 @@ public class XPathUtil {
* @param xPathQuery XPath Query
* @param namespaces Space separated set of prefix=namespace
* @param isNegated invert result
- * @throws SaxonApiException
- * @throws FactoryConfigurationError
+ * @throws SaxonApiException when the parser has problems with the given xml or xpath query
+ * @throws FactoryConfigurationError when the parser can not be instantiated
*/
public static void computeAssertionResultUsingSaxon(AssertionResult result, String xmlFile, String xPathQuery,
String namespaces, Boolean isNegated) throws SaxonApiException, FactoryConfigurationError {
@@ -695,7 +695,7 @@ public class XPathUtil {
return;
}
try (StringReader reader = new StringReader(xmlFile)) {
- // We could instanciate it once but might trigger issues in the future
+ // We could instantiate it once but might trigger issues in the future
// Sharing of a DocumentBuilder across multiple threads is not recommended.
// However, in the current implementation sharing a DocumentBuilder (once
// initialized)
[jmeter] 02/02: Revert "Don't call initSvn in ant run as we don't
have subversion anymore."
Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit b11e8b2ccd9859042c6a9fd164d96ea6045d2584
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sun Jul 14 14:55:43 2019 +0200
Revert "Don't call initSvn in ant run as we don't have subversion anymore."
This reverts commit 6a5ad8e59d0141b6cef0f97c394d5d468780d59b.
We need the version to be initialized for the nightly builds. As init-svnVersion
will not work on git, we have to add -Ddisable-svnCheck=true to the nightly
build workers and rely.
---
build.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 135d132..fcb52f3 100644
--- a/build.xml
+++ b/build.xml
@@ -1639,7 +1639,7 @@ run JMeter unless all the JMeter jars are added.
</target>
<target
name="nightly"
- depends="ant-version,nightly-setup,install,docs-printable,docs-api,test,_distribution"
+ depends="ant-version,nightly-setup,init-svnVersion,install,docs-printable,docs-api,test,_distribution"
description="Build JMeter for nightly distribution (include docs)"/>
<target name="_eolcheck">
@@ -3926,7 +3926,7 @@ run JMeter unless all the JMeter jars are added.
<target name="sonar" depends="compile, install, coverage, _sonar" />
- <target name="nightlysonar" depends="_coverage.prepare, nightly, _coverage.report, _sonar, complete-junit" />
+ <target name="nightlysonar" depends="_coverage.prepare, nightly, init-svnVersion, _coverage.report, _sonar, complete-junit" />
<target name="setproxy" if="${proxy.use}">
<setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"