You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2023/01/09 10:12:17 UTC
[jmeter] branch master updated (eb3a225791 -> 2317d98449)
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
from eb3a225791 Add missing contributor from list of fixes
new 62230c020a Use the most recent version for the autostyle plugin
new 33a6d68814 Increase heap size
new 7cb5772a15 Ignore empty directories for batch test task input directory
new 2317d98449 Use newest version of vlsi-release-plugins
The 4 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:
buildSrc/checksum.xml | 1 +
buildSrc/gradle.properties | 4 ++--
buildSrc/settings.gradle.kts | 8 ++++----
.../org/apache/jmeter/buildtools/batchtest/BatchTest.kt | 2 ++
checksum.xml | 13 +++++++++++++
gradle.properties | 10 +++++-----
settings.gradle.kts | 8 ++++----
7 files changed, 31 insertions(+), 15 deletions(-)
[jmeter] 01/04: Use the most recent version for the autostyle plugin
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 62230c020a0232e3b15f3378eb26eeba51d2f6f7
Author: Sandra Thieme <st...@gradle.com>
AuthorDate: Fri Jan 6 11:01:12 2023 +0100
Use the most recent version for the autostyle plugin
This version contains fixes to exclude empty directories for input
files that previously caused issues with incremental builds because
some empty directories are created during a build. Subsequent builds
then had different input files and where no longer up to date.
---
gradle.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle.properties b/gradle.properties
index c250716fd8..fef539a6d4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -40,7 +40,7 @@ spotbugs.version=4.1.2
velocity.version=1.7
# Plugins
-com.github.autostyle.version=3.0
+com.github.autostyle.version=3.2
com.github.spotbugs.version=4.5.0
com.github.vlsi.checksum-dependency.sha512=84572B7F654D1F9842DDD7E0D4331461DC55B92CDC1DA8EBA2269870CE027B021AB91D1942043145825B00521A92029C969BFA388A27BD63CC509BF7AB18E35F
com.github.vlsi.checksum-dependency.version=1.77
[jmeter] 02/04: Increase heap size
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 33a6d68814651deae54f390408cee482c26a0c33
Author: Sandra Thieme <st...@gradle.com>
AuthorDate: Fri Jan 6 11:08:46 2023 +0100
Increase heap size
Total heap size should be bigger than max metaspace size which is part
of the heap.
---
gradle.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle.properties b/gradle.properties
index fef539a6d4..3a15e98165 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,7 @@
# limitations under the License.
#
-org.gradle.jvmargs=-Xmx512m -XX:MaxMetaspaceSize=512m
+org.gradle.jvmargs=-Xmx768m -XX:MaxMetaspaceSize=512m
org.gradle.parallel=true
# Build cache can be disabled with --no-build-cache option
org.gradle.caching=true
[jmeter] 04/04: Use newest version of vlsi-release-plugins
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 2317d984499a5604dbf5d5c4d2b4b7301e459904
Author: Sandra Thieme <st...@gradle.com>
AuthorDate: Mon Jan 9 09:24:45 2023 +0100
Use newest version of vlsi-release-plugins
1.85 contains a fix for the license gather plugin switching absolute to
relative paths to better support build caching.
---
buildSrc/checksum.xml | 1 +
buildSrc/gradle.properties | 4 ++--
buildSrc/settings.gradle.kts | 8 ++++----
checksum.xml | 13 +++++++++++++
gradle.properties | 6 +++---
settings.gradle.kts | 8 ++++----
6 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/buildSrc/checksum.xml b/buildSrc/checksum.xml
index 30aaae10ce..5644a08107 100644
--- a/buildSrc/checksum.xml
+++ b/buildSrc/checksum.xml
@@ -27,6 +27,7 @@
<trusted-key id='379ce192d401ab61' group='info.picocli' />
<trusted-key id='efe8086f9e93774e' group='junit' />
<trusted-key id='c84125c13bf6f2f2' group='org.ajoberstar.grgit' />
+ <trusted-key id='ee8ecbbbc188fd5d' group='org.ajoberstar.grgit' />
<trusted-key id='6b1b008864323b92' group='org.antlr' />
<trusted-key id='9daadc1c9fcc82d0' group='org.apache.commons' />
<trusted-key id='7c25280eae63ebe5' group='org.apache.httpcomponents' />
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index c8a1d01f88..7ed05daa95 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -19,5 +19,5 @@ ktlint.version=0.40.0
# Plugins
com.github.autostyle.version=3.0
-com.github.vlsi.checksum-dependency.sha512=84572B7F654D1F9842DDD7E0D4331461DC55B92CDC1DA8EBA2269870CE027B021AB91D1942043145825B00521A92029C969BFA388A27BD63CC509BF7AB18E35F
-com.github.vlsi.checksum-dependency.version=1.74
+com.github.vlsi.checksum-dependency.sha512=8D11977F8A42F1D7F862C4BB945EAB1FB3EDCDD2CFEEC13EAF1720BFCC3B510F4E6512247458C59111867AF6C435FBB7231BD47A7E2443C97BC77B2BBEC214A5
+com.github.vlsi.checksum-dependency.version=1.85
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index 7b5d5e7b56..ff63671893 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -55,10 +55,10 @@ buildscript {
// Note: we need to verify the checksum for checksum-dependency-plugin itself
val expectedSha512 = mapOf(
- "43BC9061DFDECA0C421EDF4A76E380413920E788EF01751C81BDC004BD28761FBD4A3F23EA9146ECEDF10C0F85B7BE9A857E9D489A95476525565152E0314B5B"
- to "bcpg-jdk15on-1.62.jar",
- "2BA6A5DEC9C8DAC2EB427A65815EB3A9ADAF4D42D476B136F37CD57E6D013BF4E9140394ABEEA81E42FBDB8FC59228C7B85C549ED294123BF898A7D048B3BD95"
- to "bcprov-jdk15on-1.62.jar",
+ "4E240B7811EF90C090E83A181DACE41DA487555E4136221861B0060F9AF6D8B316F2DD0472F747ADB98CA5372F46055456EF04BDC0C3992188AB13302922FCE9"
+ to "bcpg-jdk15on-1.70.jar",
+ "7DCCFC636EE4DF1487615818CFA99C69941081DF95E8EF1EAF4BCA165594DFF9547E3774FD70DE3418ABACE77D2C45889F70BCD2E6823F8539F359E68EAF36D1"
+ to "bcprov-jdk15on-1.70.jar",
"17DAAF511BE98F99007D7C6B3762C9F73ADD99EAB1D222985018B0258EFBE12841BBFB8F213A78AA5300F7A3618ACF252F2EEAD196DF3F8115B9F5ED888FE827"
to "okhttp-4.1.0.jar",
"93E7A41BE44CC17FB500EA5CD84D515204C180AEC934491D11FC6A71DAEA761FB0EECEF865D6FD5C3D88AAF55DCE3C2C424BE5BA5D43BEBF48D05F1FA63FA8A7"
diff --git a/checksum.xml b/checksum.xml
index a977f79de4..ff876d11e6 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -111,6 +111,7 @@
<trusted-key id='098a31f381819057' group='net.sourceforge.nekohtml' />
<trusted-key id='4a1bac7f1e3b89b3' group='nl.jqno.equalsverifier' />
<trusted-key id='c84125c13bf6f2f2' group='org.ajoberstar.grgit' />
+ <trusted-key id='ee8ecbbbc188fd5d' group='org.ajoberstar.grgit' />
<trusted-key id='347cd0eaed975c5f' group='org.antlr' />
<trusted-key id='6b1b008864323b92' group='org.antlr' />
<trusted-key id='411063a3a0ffd119' group='org.apache-extras.beanshell' />
@@ -227,6 +228,18 @@
<dependency group='com.github.bulenkov.darcula' module='darcula' version='e208efb96f70e4be9dc362fbb46f6e181ef501dd'>
<sha512>80F3335D8EA3FB3FF07A12A79C958C4E3F8BB542511C52825A8B3694AC96F027E24396CE9EDCEFA44EE93B5CBED4E4AED4575E6AAED56F363BAE92C52EE85D22</sha512>
</dependency>
+ <dependency group='com.github.vlsi.gradle' module='crlf-plugin' version='1.85'>
+ <sha512>59CD14C68456ADD477C6B6ACC8AC330EE5A10BA4394E3434450E958EC04968197C3EDAE8F3693D42CA32A5C0F639D6D60CF155B659D91CF89301744130087D9A</sha512>
+ </dependency>
+ <dependency group='com.github.vlsi.gradle' module='gradle-extensions-plugin' version='1.85'>
+ <sha512>42B201D43EC742D1EC4122D936291A6FF3C757E9522CA1940D2E25847F4B15D1AF814F4ED9139CD86D501849D2FD887725BF5498471D62FCBDD906AD6F167B8</sha512>
+ </dependency>
+ <dependency group='com.github.vlsi.gradle' module='license-gather-plugin' version='1.85'>
+ <sha512>C9B64C9E8D0BE6108D479BE50D156007438CD193517CB79BEE3B9C172F38502EA77CC757D79B78C1BF7436F7747D87FE0E1B59893A5259F29711B72D7AFE1774</sha512>
+ </dependency>
+ <dependency group='com.github.vlsi.gradle' module='stage-vote-release-plugin' version='1.85'>
+ <sha512>2F70DA03A8F8ECF0F92C7B8B219321DFE9C8926DC55BF343662B043F277C7F63090B1B7E06F963606D9D9228E3FA4245393E2D3773DFD3D059136EB65D2E7998</sha512>
+ </dependency>
<dependency group='commons-logging' module='commons-logging' version='1.0.4'>
<sha512>C8D2D39A60ADCC49091D393DAF30473D1776E4B6B09BB86639171F660833A17AFBDC9F3E85843093535DA16FA664CD7CD4CA38F54E141018DD1B78DE681AD668</sha512>
</dependency>
diff --git a/gradle.properties b/gradle.properties
index 3a15e98165..649ddff078 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -42,9 +42,9 @@ velocity.version=1.7
# Plugins
com.github.autostyle.version=3.2
com.github.spotbugs.version=4.5.0
-com.github.vlsi.checksum-dependency.sha512=84572B7F654D1F9842DDD7E0D4331461DC55B92CDC1DA8EBA2269870CE027B021AB91D1942043145825B00521A92029C969BFA388A27BD63CC509BF7AB18E35F
-com.github.vlsi.checksum-dependency.version=1.77
-com.github.vlsi.vlsi-release-plugins.version=1.77
+com.github.vlsi.checksum-dependency.sha512=8D11977F8A42F1D7F862C4BB945EAB1FB3EDCDD2CFEEC13EAF1720BFCC3B510F4E6512247458C59111867AF6C435FBB7231BD47A7E2443C97BC77B2BBEC214A5
+com.github.vlsi.checksum-dependency.version=1.85
+com.github.vlsi.vlsi-release-plugins.version=1.85
kotlin.version=1.6.21
# Restrict uses of Kotlin APIs to 1.5 only, so projects that use Kotlin 1.5 can use JMeter
kotlin.api.version=1.5
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8fce3cdecc..41dfe98bdb 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -153,10 +153,10 @@ val expectedSha512 = mapOf(
to "gradle-enterprise-gradle-plugin-3.8.jar",
"11BED06D6ECD5669DE3F32A0B386A223C2B2BA532A3C80D3E1613B29A1A264E1A75CDF142273F17EE1845287C76CF1F9D68CD97542318B1A9126104CE958824A"
to "gradle-enterprise-gradle-plugin-3.8.1.jar",
- "FA305ACAAF45D005F5032D93C4F37CD097936C802943885A8F2B9EC27DA24F148DB41748655347C9A707C62614087432B3D32CC1B297381D45F3D8063BFFFA6D"
- to "bcpg-jdk15on-1.62.jar",
- "2BA6A5DEC9C8DAC2EB427A65815EB3A9ADAF4D42D476B136F37CD57E6D013BF4E9140394ABEEA81E42FBDB8FC59228C7B85C549ED294123BF898A7D048B3BD95"
- to "bcprov-jdk15on-1.62.jar",
+ "4E240B7811EF90C090E83A181DACE41DA487555E4136221861B0060F9AF6D8B316F2DD0472F747ADB98CA5372F46055456EF04BDC0C3992188AB13302922FCE9"
+ to "bcpg-jdk15on-1.70.jar",
+ "7DCCFC636EE4DF1487615818CFA99C69941081DF95E8EF1EAF4BCA165594DFF9547E3774FD70DE3418ABACE77D2C45889F70BCD2E6823F8539F359E68EAF36D1"
+ to "bcprov-jdk15on-1.70.jar",
"17DAAF511BE98F99007D7C6B3762C9F73ADD99EAB1D222985018B0258EFBE12841BBFB8F213A78AA5300F7A3618ACF252F2EEAD196DF3F8115B9F5ED888FE827"
to "okhttp-4.1.0.jar",
"93E7A41BE44CC17FB500EA5CD84D515204C180AEC934491D11FC6A71DAEA761FB0EECEF865D6FD5C3D88AAF55DCE3C2C424BE5BA5D43BEBF48D05F1FA63FA8A7"
[jmeter] 03/04: Ignore empty directories for batch test task input directory
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 7cb5772a1542bcb570532602b802253e104555d4
Author: Sandra Thieme <st...@gradle.com>
AuthorDate: Fri Jan 6 11:17:19 2023 +0100
Ignore empty directories for batch test task input directory
Empty directories are created in bin/testfiles that need to be ignored
as task inputs to improve incremental builds.
---
.../src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt b/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
index 95daf993f9..cf19f44612 100644
--- a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
+++ b/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
@@ -25,6 +25,7 @@ import org.eclipse.jgit.diff.RawTextComparator
import org.eclipse.jgit.util.io.AutoCRLFInputStream
import org.gradle.api.GradleException
import org.gradle.api.model.ObjectFactory
+import org.gradle.api.tasks.IgnoreEmptyDirectories
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.InputDirectory
import org.gradle.api.tasks.InputFile
@@ -48,6 +49,7 @@ open class BatchTest @Inject constructor(objects: ObjectFactory) : JavaExec() {
val testName = objects.property<String>()
@InputDirectory
+ @IgnoreEmptyDirectories
val inputDirectory = objects.directoryProperty().convention(
project.rootProject.layout.projectDirectory.dir("bin/testfiles")
)