[jmeter] branch master updated: Updated Apache log4j to 2.13.0 (from 2.12.1)
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 The following commit(s) were added to refs/heads/master by this push: new a8a41b3 Updated Apache log4j to 2.13.0 (from 2.12.1) a8a41b3 is described below commit a8a41b30e055700ed57a1f6341c64e4314507782 Author: Felix Schumacher AuthorDate: Sun Feb 16 22:53:39 2020 +0100 Updated Apache log4j to 2.13.0 (from 2.12.1) --- gradle.properties | 2 +- xdocs/changes.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b1ca7d2..ffd67d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -97,7 +97,7 @@ jsoup.version=1.12.2 jtidy.version=r938 junit4.version=4.12 junit5.version=5.5.1 -log4j.version=2.12.1 +log4j.version=2.13.0 mail.version=1.5.0-b01 miglayout.version=5.2 mina-core.version=2.0.19 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index e366d68..798fb62 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -139,6 +139,7 @@ to view the last release notes of version 5.2.1. Updated Apache httpclient and httpmime to 4.5.11 (from 4.5.10) Updated Apache httpcore and httpcore-nio to 4.4.13 (from 4.4.12) Updated jmespath to 0.5.0 (from 0.3.0) +Updated Apache log4j to 2.13.0 (from 2.12.1)
Re: [jmeter] branch darklaf created (now 7beabb6)
That was "push to a wrong repository". The branch is removed. Vladimir
[jmeter] 01/01: Update to never darklaf
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch darklaf
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 7beabb6f0f1ebf4a2bdde9aa3552eed4f68794e7
Author: Vladimir Sitnikov
AuthorDate: Mon Feb 17 00:37:21 2020 +0300
Update to never darklaf
---
checksum.xml | 1 +
gradle.properties | 2 +-
settings.gradle.kts | 7 ++-
src/bom/build.gradle.kts | 2 +-
src/core/build.gradle.kts | 2 +-
src/dist/build.gradle.kts | 2 +-
6 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/checksum.xml b/checksum.xml
index 7e4d5d1..ef62171 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -8,6 +8,7 @@
+
diff --git a/gradle.properties b/gradle.properties
index 110aa79..a8ef79e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -67,7 +67,7 @@ commons-net.version=3.6
commons-pool2.version=2.7.0
commons-text.version=1.8
darcula.version=e208efb96f70e4be9dc362fbb46f6e181ef501dd
-darklaf.version=1.3.3.4
+darklaf-core.version=1.3.3.4
dec.version=0.1.2
dnsjava.version=2.1.9
equalsverifier.version=3.1.9
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1132fdf..4d12faa 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -145,5 +145,10 @@ apply(plugin = "com.github.vlsi.checksum-dependency")
// This enables to try local Autostyle
property("localAutostyle")?.ifBlank { "../autostyle" }?.let {
println("Importing project '$it'")
-includeBuild("../autostyle")
+includeBuild(it)
+}
+
+property("localAutostyle")?.ifBlank { "../darklaf" }?.let {
+println("Importing project '$it'")
+includeBuild(it)
}
diff --git a/src/bom/build.gradle.kts b/src/bom/build.gradle.kts
index 0102210..11580e8 100644
--- a/src/bom/build.gradle.kts
+++ b/src/bom/build.gradle.kts
@@ -49,7 +49,7 @@ dependencies {
runtimev("org.apache.tika:tika-parsers", "tika")
runtimev("org.ow2.asm:asm")
runtimev("com.github.bulenkov.darcula:darcula")
-apiv("com.github.weisj:darklaf")
+apiv("com.github.weisj:darklaf-core")
// activemq-all should not be used as it provides secondary slf4j
binding
runtimev("org.apache.activemq:activemq-broker", "activemq")
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index d37d8bb..d156709 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies {
api(project(":src:jorphan"))
testCompile(project(":src:jorphan", "testClasses"))
-implementation("com.github.weisj:darklaf")
+implementation("com.github.weisj:darklaf-core")
api("bsf:bsf") {
because("protected BSFManager BSFTestElement#getManager()")
}
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 797792e..b7398b5 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -76,7 +76,7 @@ dependencies {
It just looks good, however Darcula is not used explicitly,
so the dependency is added for distribution only""".trimIndent())
}
-runtimeOnly("com.github.weisj:darklaf")
+runtimeOnly("com.github.weisj:darklaf-core")
binLicense(project(":src:licenses", "binLicense"))
srcLicense(project(":src:licenses", "srcLicense"))
[jmeter] branch darklaf created (now 7beabb6)
This is an automated email from the ASF dual-hosted git repository. vladimirsitnikov pushed a change to branch darklaf in repository https://gitbox.apache.org/repos/asf/jmeter.git. at 7beabb6 Update to never darklaf This branch includes the following new commits: new 7beabb6 Update to never darklaf The 1 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.
[jmeter] branch master updated: Remove hack and document the web interface to clean the cache
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 The following commit(s) were added to refs/heads/master by this push: new 04964ec Remove hack and document the web interface to clean the cache 04964ec is described below commit 04964ecb6f427903ae1fdffdcdcc5beb42e09100 Author: Felix Schumacher AuthorDate: Sun Feb 16 22:23:29 2020 +0100 Remove hack and document the web interface to clean the cache --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a1fe8b5..4e9f9df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,9 @@ language: java # skip default "install" command install: true +# We can clean the caches via web at https://travis-ci.org/apache/jmeter/caches before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - - rm -rf $HOME/.gradle/caches/modules-2/files-2.1/org.bouncycastle - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ - rm -rf $HOME/.m2/repository/org/apache/jmeter
[jmeter] branch master updated: Try to cleanup gradle cache for bouncycastle on travis
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 The following commit(s) were added to refs/heads/master by this push: new df53434 Try to cleanup gradle cache for bouncycastle on travis df53434 is described below commit df5343415525df9e31ad706719d92836c27c0775 Author: Felix Schumacher AuthorDate: Sun Feb 16 22:13:03 2020 +0100 Try to cleanup gradle cache for bouncycastle on travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b1f00c9..a1fe8b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ install: true before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock + - rm -rf $HOME/.gradle/caches/modules-2/files-2.1/org.bouncycastle - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ - rm -rf $HOME/.m2/repository/org/apache/jmeter
[jmeter] branch master updated: Correct typo in comment in travis file
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 The following commit(s) were added to refs/heads/master by this push: new f59f36b Correct typo in comment in travis file f59f36b is described below commit f59f36b6682768adc6a170c58cf501a45a56feeb Author: Felix Schumacher AuthorDate: Sun Feb 16 22:05:36 2020 +0100 Correct typo in comment in travis file --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e1b0821..b1f00c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ matrix: - LC_ALL=fr_FR.UTF-8 script: # This job verifies headless mode to ensure Apache JMeter is workable in headless as well -# Spotless and Checksyle are skipped here to save some time. They are verified anyway in Java 8 and Java 13 builds, so skipping them for Java 11 does not harm +# Spotless and Checkstyle are skipped here to save some time. They are verified anyway in Java 8 and Java 13 builds, so skipping them for Java 11 does not harm - ./gradlew build -Djava.awt.headless=true -Duser.language=fr -Duser.country=FR -PskipCheckstyle -PskipSpotless $SKIP_TAR - name: Tests with OpenJDK 11 on s390x os: linux @@ -74,7 +74,7 @@ matrix: - LANG=fr_FR.UTF-8 - LC_ALL=fr_FR.UTF-8 script: -# Spotless, Checksyle, and JaCoCo are verified here to ensure they all work with the latest supported Java +# Spotless, Checkstyle, and JaCoCo are verified here to ensure they all work with the latest supported Java - xvfb-run ./gradlew build jacocoReport -Duser.language=fr -Duser.country=FR $SKIP_TAR - name: jmeter-maven-plugin tests jdk: openjdk8
[jmeter] branch master updated: Updated jmespath to 0.5.0 (from 0.3.0)
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 The following commit(s) were added to refs/heads/master by this push: new e39e820 Updated jmespath to 0.5.0 (from 0.3.0) e39e820 is described below commit e39e82075e65e0a951373bd27e7b855c75531233 Author: Felix Schumacher AuthorDate: Sun Feb 16 22:04:44 2020 +0100 Updated jmespath to 0.5.0 (from 0.3.0) --- gradle.properties | 4 ++-- xdocs/changes.xml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index e4225b4..b1ca7d2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -88,8 +88,8 @@ jackson-databind.version=2.10.2 javax.activation.version=1.2.0 jcharts.version=0.7.5 jdom.version=1.1.3 -jmespath-core.version=0.3.0 -jmespath-jackson.version=0.3.0 +jmespath-core.version=0.5.0 +jmespath-jackson.version=0.5.0 jodd.version=5.0.13 json-path.version=2.4.0 json-smart.version=2.3 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index f664145..e366d68 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -138,6 +138,7 @@ to view the last release notes of version 5.2.1. Updated hamcrest to 2.2 (from 2.1) Updated Apache httpclient and httpmime to 4.5.11 (from 4.5.10) Updated Apache httpcore and httpcore-nio to 4.4.13 (from 4.4.12) +Updated jmespath to 0.5.0 (from 0.3.0)
[jmeter] branch master updated: Updated jackson to 2.10.2 (from 2.10.1)
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 The following commit(s) were added to refs/heads/master by this push: new ddb3596 Updated jackson to 2.10.2 (from 2.10.1) ddb3596 is described below commit ddb3596a29d6b4722fdf4056cf3492103e37d194 Author: Felix Schumacher AuthorDate: Sun Feb 16 21:51:45 2020 +0100 Updated jackson to 2.10.2 (from 2.10.1) Bugzilla Id: 63963 Relates to #546 --- gradle.properties | 4 ++-- xdocs/changes.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0949419..e4225b4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -83,8 +83,8 @@ httpclient.version=4.5.11 httpcore-nio.version=4.4.13 httpcore.version=4.4.13 httpmime.version=4.5.11 -jackson.version=2.10.1 -jackson-databind.version=2.10.1 +jackson.version=2.10.2 +jackson-databind.version=2.10.2 javax.activation.version=1.2.0 jcharts.version=0.7.5 jdom.version=1.1.3 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index cf85b59..f664145 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -124,7 +124,7 @@ to view the last release notes of version 5.2.1. Non-functional changes -63963546Updated jackson to 2.10.1 (from 2.9.10) +63963546Updated jackson to 2.10.2 (from 2.9.10) 64120Updated jsoup to 1.12.2 (from 1.12.1) 63809Updated commons-dbcp2 to 2.7.0 (from 2.5.0) Updated Apache ActiveMQ to 5.15.11 (from 5.15.8)
[jmeter] branch master updated: Updated httpclient, httpmime, httpcore and httpcore-nio
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 The following commit(s) were added to refs/heads/master by this push: new 1dd3c50 Updated httpclient, httpmime, httpcore and httpcore-nio 1dd3c50 is described below commit 1dd3c50a290503b2ce169e8a2f48eb964cc331e9 Author: Felix Schumacher AuthorDate: Sun Feb 16 21:40:22 2020 +0100 Updated httpclient, httpmime, httpcore and httpcore-nio Updated Apache httpclient and httpmime to 4.5.11 (from 4.5.10) Updated Apache httpcore and httpcore-nio to 4.4.13 (from 4.4.12) --- gradle.properties | 8 xdocs/changes.xml | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6fefa72..0949419 100644 --- a/gradle.properties +++ b/gradle.properties @@ -79,10 +79,10 @@ hamcrest.version=2.2 hamcrest-date.version=2.0.4 hsqldb.version=2.5.0 httpasyncclient.version=4.1.4 -httpclient.version=4.5.10 -httpcore-nio.version=4.4.12 -httpcore.version=4.4.12 -httpmime.version=4.5.10 +httpclient.version=4.5.11 +httpcore-nio.version=4.4.13 +httpcore.version=4.4.13 +httpmime.version=4.5.11 jackson.version=2.10.1 jackson-databind.version=2.10.1 javax.activation.version=1.2.0 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 8b8816e..cf85b59 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -136,6 +136,8 @@ to view the last release notes of version 5.2.1. Updated Apache Groovy to 2.4.18 (from 2.4.16) Updated hsqldb to 2.5.0 (from 2.4.1) Updated hamcrest to 2.2 (from 2.1) +Updated Apache httpclient and httpmime to 4.5.11 (from 4.5.10) +Updated Apache httpcore and httpcore-nio to 4.4.13 (from 4.4.12)
[jmeter] branch master updated: Add license override for hamcrest 2.2
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
The following commit(s) were added to refs/heads/master by this push:
new ca422a3 Add license override for hamcrest 2.2
ca422a3 is described below
commit ca422a3c5275f6645647af6f05ca50ff295b93b8
Author: Felix Schumacher
AuthorDate: Sun Feb 16 21:27:39 2020 +0100
Add license override for hamcrest 2.2
---
src/licenses/build.gradle.kts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index f2921ad..459934b 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -166,7 +166,7 @@ val gatherBinaryLicenses by
tasks.registering(GatherLicenseTask::class) {
effectiveLicense = SpdxLicense.Apache_2_0
}
for (lib in listOf("hamcrest-core", "hamcrest")) {
-overrideLicense("org.hamcrest:$lib:2.1") {
+overrideLicense("org.hamcrest:$lib:2.2") {
// https://github.com/hamcrest/JavaHamcrest/issues/264
// pom.xml lists "New BSD License", however it is BSD_3
expectedLicense = SpdxLicense.BSD_3_Clause
[jmeter] branch master updated: Updated hamcrest to 2.2 (from 2.1)
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 The following commit(s) were added to refs/heads/master by this push: new 5ed280c Updated hamcrest to 2.2 (from 2.1) 5ed280c is described below commit 5ed280ce64560637e266a3d8e9fb6f19f7fd8270 Author: Felix Schumacher AuthorDate: Sun Feb 16 21:16:12 2020 +0100 Updated hamcrest to 2.2 (from 2.1) --- gradle.properties | 2 +- xdocs/changes.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8dce8c7..6fefa72 100644 --- a/gradle.properties +++ b/gradle.properties @@ -75,7 +75,7 @@ ftplet-api.version=1.1.1 ftpserver-core.version=1.1.1 geronimo-jms_1.1_spec.version=1.1.1 groovy-all.version=2.4.18 -hamcrest.version=2.1 +hamcrest.version=2.2 hamcrest-date.version=2.0.4 hsqldb.version=2.5.0 httpasyncclient.version=4.1.4 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index c859e02..8b8816e 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -135,6 +135,7 @@ to view the last release notes of version 5.2.1. Updated equalsverifier to 3.1.9 (from 3.1.12) Updated Apache Groovy to 2.4.18 (from 2.4.16) Updated hsqldb to 2.5.0 (from 2.4.1) +Updated hamcrest to 2.2 (from 2.1)
[jmeter] branch master updated: Updated hsqldb to 2.5.0 (from 2.4.1)
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 The following commit(s) were added to refs/heads/master by this push: new 0060af9 Updated hsqldb to 2.5.0 (from 2.4.1) 0060af9 is described below commit 0060af9f4a19c8ffa235156b18eacd15dbdd904c Author: Felix Schumacher AuthorDate: Sun Feb 16 21:04:25 2020 +0100 Updated hsqldb to 2.5.0 (from 2.4.1) --- gradle.properties | 2 +- xdocs/changes.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 50ebd74..8dce8c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -77,7 +77,7 @@ geronimo-jms_1.1_spec.version=1.1.1 groovy-all.version=2.4.18 hamcrest.version=2.1 hamcrest-date.version=2.0.4 -hsqldb.version=2.4.1 +hsqldb.version=2.5.0 httpasyncclient.version=4.1.4 httpclient.version=4.5.10 httpcore-nio.version=4.4.12 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index af2d294..c859e02 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -134,6 +134,7 @@ to view the last release notes of version 5.2.1. Updated Apache commons-pool to 2.8.0 (from 2.7.0) Updated equalsverifier to 3.1.9 (from 3.1.12) Updated Apache Groovy to 2.4.18 (from 2.4.16) +Updated hsqldb to 2.5.0 (from 2.4.1)
[jmeter] 01/02: Updated equalsverifier to 3.1.9 (from 3.1.12)
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 12e772e5050839847892934d0c44d4fc3c284288 Author: Felix Schumacher AuthorDate: Sun Feb 16 20:45:05 2020 +0100 Updated equalsverifier to 3.1.9 (from 3.1.12) --- gradle.properties | 2 +- xdocs/changes.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d09956d..b39b36f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -69,7 +69,7 @@ commons-text.version=1.8 darcula.version=e208efb96f70e4be9dc362fbb46f6e181ef501dd dec.version=0.1.2 dnsjava.version=2.1.9 -equalsverifier.version=3.1.9 +equalsverifier.version=3.1.12 freemarker.version=2.3.29 ftplet-api.version=1.1.1 ftpserver-core.version=1.1.1 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 1583ee3..200f8c7 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -132,6 +132,7 @@ to view the last release notes of version 5.2.1. Updated asm to 7.3.1 (from 7.1) Updated Apache commons-codec to 1.14 (from 1.13) Updated Apache commons-pool to 2.8.0 (from 2.7.0) +Updated equalsverifier to 3.1.9 (from 3.1.12)
[jmeter] branch master updated (81967d9 -> 868cc46)
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 81967d9 Last commit updated commons-pool2 new 12e772e Updated equalsverifier to 3.1.9 (from 3.1.12) new 868cc46 Updated Apache Groovy to 2.4.18 (from 2.4.16) 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: gradle.properties | 4 ++-- xdocs/changes.xml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)
[jmeter] 02/02: Updated Apache Groovy to 2.4.18 (from 2.4.16)
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 868cc4601e72b74e913cb8f43ffcd72c625c6f2d Author: Felix Schumacher AuthorDate: Sun Feb 16 20:53:52 2020 +0100 Updated Apache Groovy to 2.4.18 (from 2.4.16) --- gradle.properties | 2 +- xdocs/changes.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b39b36f..50ebd74 100644 --- a/gradle.properties +++ b/gradle.properties @@ -74,7 +74,7 @@ freemarker.version=2.3.29 ftplet-api.version=1.1.1 ftpserver-core.version=1.1.1 geronimo-jms_1.1_spec.version=1.1.1 -groovy-all.version=2.4.16 +groovy-all.version=2.4.18 hamcrest.version=2.1 hamcrest-date.version=2.0.4 hsqldb.version=2.4.1 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 200f8c7..af2d294 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -133,6 +133,7 @@ to view the last release notes of version 5.2.1. Updated Apache commons-codec to 1.14 (from 1.13) Updated Apache commons-pool to 2.8.0 (from 2.7.0) Updated equalsverifier to 3.1.9 (from 3.1.12) +Updated Apache Groovy to 2.4.18 (from 2.4.16)
[jmeter] branch master updated: Last commit updated commons-pool2
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 The following commit(s) were added to refs/heads/master by this push: new 81967d9 Last commit updated commons-pool2 81967d9 is described below commit 81967d917a769d861271df5b17075bf1d098d2a4 Author: Felix Schumacher AuthorDate: Sun Feb 16 19:51:04 2020 +0100 Last commit updated commons-pool2 Correct changelog from 9f3d39ddd3797bf3b9281708984eaa6010f063b7 --- xdocs/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 6a5f1ed..1583ee3 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -131,7 +131,7 @@ to view the last release notes of version 5.2.1. Updated bouncycastle to 1.64 (from 1.60) Updated asm to 7.3.1 (from 7.1) Updated Apache commons-codec to 1.14 (from 1.13) -Updated Apache commons-dbcp2 to 2.8.0 (from 2.7.0) +Updated Apache commons-pool to 2.8.0 (from 2.7.0)
[jmeter] branch master updated: Updated Apache commons-dbcp2 to 2.8.0 (from 2.7.0)
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 The following commit(s) were added to refs/heads/master by this push: new 9f3d39d Updated Apache commons-dbcp2 to 2.8.0 (from 2.7.0) 9f3d39d is described below commit 9f3d39ddd3797bf3b9281708984eaa6010f063b7 Author: Felix Schumacher AuthorDate: Sun Feb 16 19:48:40 2020 +0100 Updated Apache commons-dbcp2 to 2.8.0 (from 2.7.0) --- gradle.properties | 2 +- xdocs/changes.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9436041..d09956d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -64,7 +64,7 @@ commons-lang.version=2.6 commons-lang3.version=3.9 commons-math3.version=3.6.1 commons-net.version=3.6 -commons-pool2.version=2.7.0 +commons-pool2.version=2.8.0 commons-text.version=1.8 darcula.version=e208efb96f70e4be9dc362fbb46f6e181ef501dd dec.version=0.1.2 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 2950ddb..6a5f1ed 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -131,6 +131,7 @@ to view the last release notes of version 5.2.1. Updated bouncycastle to 1.64 (from 1.60) Updated asm to 7.3.1 (from 7.1) Updated Apache commons-codec to 1.14 (from 1.13) +Updated Apache commons-dbcp2 to 2.8.0 (from 2.7.0)
[jmeter] branch master updated: Updated Apache commons-codec to 1.14 (from 1.13)
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 The following commit(s) were added to refs/heads/master by this push: new 60f822c Updated Apache commons-codec to 1.14 (from 1.13) 60f822c is described below commit 60f822cac6d690ea26d7efc1d8884a5ed9bea45b Author: Felix Schumacher AuthorDate: Sun Feb 16 19:39:23 2020 +0100 Updated Apache commons-codec to 1.14 (from 1.13) --- gradle.properties | 2 +- xdocs/changes.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c172f36..9436041 100644 --- a/gradle.properties +++ b/gradle.properties @@ -54,7 +54,7 @@ bsf.version=2.4.0 bsh.version=2.0b6 caffeine.version=2.8.0 cglib-nodep.version=3.2.9 -commons-codec.version=1.13 +commons-codec.version=1.14 commons-collections.version=3.2.2 commons-dbcp2.version=2.7.0 commons-io.version=2.6 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 4f687b3..2950ddb 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -130,6 +130,7 @@ to view the last release notes of version 5.2.1. Updated Apache ActiveMQ to 5.15.11 (from 5.15.8) Updated bouncycastle to 1.64 (from 1.60) Updated asm to 7.3.1 (from 7.1) +Updated Apache commons-codec to 1.14 (from 1.13)
[jmeter] branch master updated: Updated asm to 7.3.1 (from 7.1)
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 The following commit(s) were added to refs/heads/master by this push: new fe63e6b Updated asm to 7.3.1 (from 7.1) fe63e6b is described below commit fe63e6b9186d50d697c75d0d366d42eb34c68bd5 Author: Felix Schumacher AuthorDate: Sun Feb 16 18:16:01 2020 +0100 Updated asm to 7.3.1 (from 7.1) --- gradle.properties | 2 +- xdocs/changes.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8adb4d2..c172f36 100644 --- a/gradle.properties +++ b/gradle.properties @@ -48,7 +48,7 @@ accessors-smart.version=1.2 activemq.version=5.15.11 apache-rat.version=0.13 apiguardian-api.version=1.1.0 -asm.version=7.1 +asm.version=7.3.1 bouncycastle.version=1.64 bsf.version=2.4.0 bsh.version=2.0b6 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index f751388..4f687b3 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -129,6 +129,7 @@ to view the last release notes of version 5.2.1. 63809Updated commons-dbcp2 to 2.7.0 (from 2.5.0) Updated Apache ActiveMQ to 5.15.11 (from 5.15.8) Updated bouncycastle to 1.64 (from 1.60) +Updated asm to 7.3.1 (from 7.1)
[jmeter] branch master updated: Updated bouncycastle to 1.64 (from 1.60)
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 The following commit(s) were added to refs/heads/master by this push: new 9289117 Updated bouncycastle to 1.64 (from 1.60) 9289117 is described below commit 928911738ce0fae7cc7b3b36c802990714427b4e Author: Felix Schumacher AuthorDate: Sun Feb 16 18:09:30 2020 +0100 Updated bouncycastle to 1.64 (from 1.60) --- gradle.properties | 2 +- xdocs/changes.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f42ccfd..8adb4d2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -49,7 +49,7 @@ activemq.version=5.15.11 apache-rat.version=0.13 apiguardian-api.version=1.1.0 asm.version=7.1 -bouncycastle.version=1.60 +bouncycastle.version=1.64 bsf.version=2.4.0 bsh.version=2.0b6 caffeine.version=2.8.0 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index ce8af45..f751388 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -128,6 +128,7 @@ to view the last release notes of version 5.2.1. 64120Updated jsoup to 1.12.2 (from 1.12.1) 63809Updated commons-dbcp2 to 2.7.0 (from 2.5.0) Updated Apache ActiveMQ to 5.15.11 (from 5.15.8) +Updated bouncycastle to 1.64 (from 1.60)
[jmeter] branch master updated: Updated Apache ActiveMQ to 5.15.11 (from 5.15.8)
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 The following commit(s) were added to refs/heads/master by this push: new 82bea80 Updated Apache ActiveMQ to 5.15.11 (from 5.15.8) 82bea80 is described below commit 82bea80ed131bd80cf191dd747b9a1aa9f2aa13d Author: Felix Schumacher AuthorDate: Sun Feb 16 18:01:18 2020 +0100 Updated Apache ActiveMQ to 5.15.11 (from 5.15.8) --- checksum.xml | 3 +++ gradle.properties | 2 +- xdocs/changes.xml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/checksum.xml b/checksum.xml index b734b54..2575e8f 100644 --- a/checksum.xml +++ b/checksum.xml @@ -16,6 +16,7 @@ + @@ -66,6 +67,7 @@ + @@ -85,6 +87,7 @@ + diff --git a/gradle.properties b/gradle.properties index b0dad04..f42ccfd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -45,7 +45,7 @@ org.sonarqube.version=2.7.1 # Dependencies accessors-smart.version=1.2 -activemq.version=5.15.8 +activemq.version=5.15.11 apache-rat.version=0.13 apiguardian-api.version=1.1.0 asm.version=7.1 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 771301c..ce8af45 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -127,6 +127,7 @@ to view the last release notes of version 5.2.1. 63963546Updated jackson to 2.10.1 (from 2.9.10) 64120Updated jsoup to 1.12.2 (from 1.12.1) 63809Updated commons-dbcp2 to 2.7.0 (from 2.5.0) +Updated Apache ActiveMQ to 5.15.11 (from 5.15.8)
[jmeter] branch master updated: Wait only two seconds for connection on external site for our tests
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 The following commit(s) were added to refs/heads/master by this push: new 5e6e9e9 Wait only two seconds for connection on external site for our tests 5e6e9e9 is described below commit 5e6e9e9fc335ecf09e1757b2e3b5853cb26d563b Author: Felix Schumacher AuthorDate: Sun Feb 16 16:31:53 2020 +0100 Wait only two seconds for connection on external site for our tests --- bin/testfiles/Http4ImplPreemptiveBasicAuth.jmx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/testfiles/Http4ImplPreemptiveBasicAuth.jmx b/bin/testfiles/Http4ImplPreemptiveBasicAuth.jmx index 4e82fdc..695e76a 100644 --- a/bin/testfiles/Http4ImplPreemptiveBasicAuth.jmx +++ b/bin/testfiles/Http4ImplPreemptiveBasicAuth.jmx @@ -27,8 +27,8 @@ / 6 - - +2000 +5000
[jmeter] branch master updated: Seems like our test plans were subject to the bug 64142
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 The following commit(s) were added to refs/heads/master by this push: new 99a06ac Seems like our test plans were subject to the bug 64142 99a06ac is described below commit 99a06ac24d77fd15a1adf8bc25bbec5c77c40ea5 Author: Felix Schumacher AuthorDate: Sun Feb 16 16:29:59 2020 +0100 Seems like our test plans were subject to the bug 64142 Correct the number of reported threads in the expected file, as they have changed with the fixing of bug 64142. Bugzilla Id: 64142 --- bin/testfiles/JDBC_TESTS.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/testfiles/JDBC_TESTS.xml b/bin/testfiles/JDBC_TESTS.xml index e2c5e13..ca0a704 100644 --- a/bin/testfiles/JDBC_TESTS.xml +++ b/bin/testfiles/JDBC_TESTS.xml @@ -360,7 +360,7 @@ false false - + @@ -368,7 +368,7 @@ false false - +
[jmeter] branch master updated: Apply style (gradlew style)
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 The following commit(s) were added to refs/heads/master by this push: new 50ad778 Apply style (gradlew style) 50ad778 is described below commit 50ad778d58d1ed6cb6f743df30bb4fbfe3979fa3 Author: Felix Schumacher AuthorDate: Sun Feb 16 15:37:23 2020 +0100 Apply style (gradlew style) --- xdocs/usermanual/properties_reference.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xdocs/usermanual/properties_reference.xml b/xdocs/usermanual/properties_reference.xml index bd74dd9..a520510 100644 --- a/xdocs/usermanual/properties_reference.xml +++ b/xdocs/usermanual/properties_reference.xml @@ -333,9 +333,9 @@ JMETER-SERVER Parameter that controls the RMI port used by the RemoteSampleListenerImpl (The Controller) -Default value is 0, which means port is randomly assigned. -If this is non-zero, it will be used as the base for local port numbers for the client engine. -At the moment JMeter will open up to three ports beginning with the port defined in this property. +Default value is 0, which means port is randomly assigned. +If this is non-zero, it will be used as the base for local port numbers for the client engine. +At the moment JMeter will open up to three ports beginning with the port defined in this property. You may need to open corresponding ports in the firewall on the Controller machine. Defaults to: 0
[jmeter] branch master updated: Clarify documentation of __StringToFile function regarding default value of Append to file? parameter.
This is an automated email from the ASF dual-hosted git repository. pmouawad pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git The following commit(s) were added to refs/heads/master by this push: new 1eb1950 Clarify documentation of __StringToFile function regarding default value of Append to file? parameter. 1eb1950 is described below commit 1eb1950d367e58de1d786c2951142ada6ba9f6f9 Author: pmouawad AuthorDate: Sun Feb 16 14:43:53 2020 +0100 Clarify documentation of __StringToFile function regarding default value of Append to file? parameter. Contributed by Ori Marko This resolves #543 --- xdocs/changes.xml | 4 +++- xdocs/usermanual/functions.xml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 8891394..771301c 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -173,7 +173,8 @@ to view the last release notes of version 5.2.1. 547Correct Log level documentation. Contributed by jmetertea 548Correct typos in documentation. Contributed by jmetertea 64022Correct Chinese translation for "Ignore Sub-Controller blocks". Provided by yangxiaofei77 (yangxiaofei77 at gmail.com) - 552Fix client.rmi.localport port allocation description + 552Fix client.rmi.localport port allocation description. Contributed by anant-93 + 543Clarify documentation of __StringToFile function regarding default value of Append to file? parameter. Contributed by Ori Marko General @@ -194,6 +195,7 @@ to view the last release notes of version 5.2.1. Sebastian Boga (sebastian.boga at endava.com) Liu XP (liu_xp2003 at sina.com) anant-93 (https://github.com/anant-93) + Ori Marko (orimarko at gmail.com) We also thank bug reporters who helped us improve JMeter. diff --git a/xdocs/usermanual/functions.xml b/xdocs/usermanual/functions.xml index 4a89fef..9e3ec0e 100644 --- a/xdocs/usermanual/functions.xml +++ b/xdocs/usermanual/functions.xml @@ -1730,7 +1730,7 @@ returns: The way to write the string, true means append, false -means overwrite. +means overwrite. If not specified, the default append is true. The encoding to be used to write to the file. If not specified, the default encoding is UTF-8.
[jmeter] branch master updated: Correcting client.rmi.localport port allocation description in remote
This is an automated email from the ASF dual-hosted git repository.
pmouawad pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new 1d4d59c Correcting client.rmi.localport port allocation description
in remote
1d4d59c is described below
commit 1d4d59c703ace9a426c5808cecf29bdba245442f
Author: pmouawad
AuthorDate: Sun Feb 16 14:40:05 2020 +0100
Correcting client.rmi.localport port allocation description in remote
This resolves #552
---
xdocs/changes.xml | 2 ++
xdocs/usermanual/properties_reference.xml | 6 --
xdocs/usermanual/remote-test.xml | 18 --
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 2a80d41..8891394 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -173,6 +173,7 @@ to view the last release notes of version 5.2.1.
547Correct Log level documentation. Contributed by
jmetertea
548Correct typos in documentation. Contributed by jmetertea
64022Correct Chinese translation for "Ignore Sub-Controller
blocks". Provided by yangxiaofei77 (yangxiaofei77 at gmail.com)
+ 552Fix client.rmi.localport port allocation
description
General
@@ -192,6 +193,7 @@ to view the last release notes of version 5.2.1.
ray7219
Sebastian Boga (sebastian.boga at endava.com)
Liu XP (liu_xp2003 at sina.com)
+ anant-93 (https://github.com/anant-93)
We also thank bug reporters who helped us improve JMeter.
diff --git a/xdocs/usermanual/properties_reference.xml
b/xdocs/usermanual/properties_reference.xml
index 79d4a8e..bd74dd9 100644
--- a/xdocs/usermanual/properties_reference.xml
+++ b/xdocs/usermanual/properties_reference.xml
@@ -333,8 +333,10 @@ JMETER-SERVER
Parameter that controls the RMI port used by the
RemoteSampleListenerImpl (The Controller)
-Default value is 0, which means port is randomly assigned.
-You may need to open a port in the firewall on the Controller
machine.
+Default value is 0, which means port is randomly assigned.
+If this is non-zero, it will be used as the base for local port numbers
for the client engine.
+At the moment JMeter will open up to three ports beginning with the port
defined in this property.
+You may need to open corresponding ports in the firewall on the
Controller machine.
Defaults to: 0
diff --git a/xdocs/usermanual/remote-test.xml b/xdocs/usermanual/remote-test.xml
index 9d81f22..81cb29f 100644
--- a/xdocs/usermanual/remote-test.xml
+++ b/xdocs/usermanual/remote-test.xml
@@ -87,15 +87,11 @@ Alternatively use different content in any datafiles used
by the test
To run JMeter in remote node, start the JMeter server component on all
machines you wish to run on by running
the JMETER_HOME/bin/jmeter-server (unix) or
JMETER_HOME/bin/jmeter-server.bat (windows) script.
Note that there can only be one JMeter server on each node unless different
RMI ports are used.
-Since JMeter 2.3.1, the JMeter server application starts the RMI registry
itself;
-there is no need to start RMI registry separately.
-To revert to the previous behaviour, define the JMeter property
server.rmi.create=false on the server host systems.
-
+The JMeter server application starts the RMI registry itself; there is no
need to start RMI registry separately.
-By default, RMI uses dynamic ports for the JMeter server engine. This can
cause problems for firewalls,
-so you can define the JMeter property server.rmi.localport
-to control this port numbers.
-If this is non-zero, it will be used as the base for local port numbers for
the server engine. At the moment JMeter will open up to three ports beginning
with the port defined in server.rmi.localport.
+By default, RMI uses a dynamic port for the JMeter server engine. This can
cause problems for firewalls,
+so you can define the JMeter property server.rmi.localport to
control this port number.
+it will be used as the local port number for the server engine.
Step 2: Add the server IP to your client's Properties File
Edit the properties file on the controlling JMeter machine. In
JMETER_HOME/bin/jmeter.properties,
@@ -201,8 +197,10 @@ Use the "-s" option with the jmeter startup
script ("jmeter -
JMeter/RMI requires a connection from the client to the server. This will use
the port you chose, default 1099.
JMeter/RMI also requires a reverse connection in order to return sample
results from the server to the client.
-This will use a high-numbered port.
-This port can be controlled by jmeter property called
client.rmi.localport in jmeter.properties.
+These will use high-numbered ports.
+These ports can be controlled by jmeter property called
client.rmi.localport in jmeter.properties.
+If this is non-zero, it will be used as the base for local port numbers for
the client engine. At the moment JMeter will open
+up
[jmeter] branch master updated: Updated commons-dbcp2 to 2.7.0 (from 2.5.0)
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 The following commit(s) were added to refs/heads/master by this push: new fee5548 Updated commons-dbcp2 to 2.7.0 (from 2.5.0) fee5548 is described below commit fee5548860f8dfe806a466dc0d90ffdb8a2570f4 Author: Felix Schumacher AuthorDate: Sun Feb 16 14:08:46 2020 +0100 Updated commons-dbcp2 to 2.7.0 (from 2.5.0) Bugzilla Id: 63809 --- gradle.properties | 2 +- xdocs/changes.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 76b8d2c..b0dad04 100644 --- a/gradle.properties +++ b/gradle.properties @@ -56,7 +56,7 @@ caffeine.version=2.8.0 cglib-nodep.version=3.2.9 commons-codec.version=1.13 commons-collections.version=3.2.2 -commons-dbcp2.version=2.5.0 +commons-dbcp2.version=2.7.0 commons-io.version=2.6 commons-jexl.version=2.1.1 commons-jexl3.version=3.1 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index d856a37..2a80d41 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -126,6 +126,7 @@ to view the last release notes of version 5.2.1. 63963546Updated jackson to 2.10.1 (from 2.9.10) 64120Updated jsoup to 1.12.2 (from 1.12.1) +63809Updated commons-dbcp2 to 2.7.0 (from 2.5.0)
