jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject [jmeter] branch master updated: ApacheJMeter_config.jar: Restore bin folder and add missing files
Date Sat, 09 Nov 2019 13:25:10 GMT
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 026bc91  ApacheJMeter_config.jar: Restore bin folder and add missing files
026bc91 is described below

commit 026bc91bc7e96af18799a8e71da524a73ede04d9
Author: pmouawad <p.mouawad@ubik-ingenierie.com>
AuthorDate: Sat Nov 9 14:25:56 2019 +0100

    ApacheJMeter_config.jar: Restore bin folder and add missing files
    
    This resolves Bug 63911
    
    Bug 63911 - ApacheJMeter_config.jar content has changed
    https://bz.apache.org/bugzilla/show_bug.cgi?id=63911
---
 src/config/build.gradle.kts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/config/build.gradle.kts b/src/config/build.gradle.kts
index 3cf6cd8..0abf6fc 100644
--- a/src/config/build.gradle.kts
+++ b/src/config/build.gradle.kts
@@ -38,7 +38,7 @@ tasks.named<Jar>(JavaPlugin.JAR_TASK_NAME) {
             from(files(srcLicense))
         }
     }
-    into("run") {
+into("bin") {
         filteringCharset = "UTF-8"
         CrLfSpec(LineEndings.LF).run {
             textFrom("$rootDir/bin") {
@@ -55,7 +55,11 @@ tasks.named<Jar>(JavaPlugin.JAR_TASK_NAME) {
                 text("users.xml")
             }
             into("templates") {
-                textFrom("templates/templates.dtd")
+                textFrom("$rootDir/bin/templates") {
+                    text("templates.dtd")
+                    text("templates.xml")
+                    text("*.jmx")
+                }
             }
             into("report-template") {
                 textFrom("$rootDir/bin/report-template") {


Mime
View raw message