fix pre installed plugins

IntershopCommunicationsAG · Jun 2, 2022 · e5ab1d4 · e5ab1d4
1 parent 301764a
commit e5ab1d4
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 46 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -23,12 +23,12 @@ RUN apk add --no-cache curl bash tzdata openjdk17 \
     && apk add --no-cache nss \
     && rm -rf /var/cache/apk/*
 
-COPY --from=gradle /home/gradle/project/build/jmeter ${JMETER_HOME}
+COPY --from=gradle /home/gradle/project/build/jmeter/ ${JMETER_HOME}
 
 COPY jmeter_cmd.sh /jmeter_cmd.sh
 
-RUN curl -o ${JMETER_HOME}/plugins/lib/ext/jmeter-plugins-resultscomparator-3.1.2.jar -L https://github.com/rbourga/jmeter-plugins-2/releases/download/v3.2.1/jmeter-plugins-resultscomparator-3.1.2.jar \
-    && curl -L https://jmeter-plugins.org/get/ > ${JMETER_HOME}/plugins/lib/ext/jmeter-plugins-manager.jar \
+RUN curl -o ${JMETER_HOME}/lib/ext/jmeter-plugins-resultscomparator-3.1.2.jar -L https://github.com/rbourga/jmeter-plugins-2/releases/download/v3.2.1/jmeter-plugins-resultscomparator-3.1.2.jar \
+    && curl -L https://jmeter-plugins.org/get/ > ${JMETER_HOME}/lib/ext/jmeter-plugins-manager.jar \
     && echo "jmeter.save.saveservice.print_field_names=true" > $JMETER_BIN/user.properties \
     && echo "server.rmi.ssl.disable=true" >> $JMETER_BIN/user.properties \
     && echo "client.rmi.localport=1099" >> $JMETER_BIN/user.properties \

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,52 +1,44 @@
 
-val jmeterlibs by configurations.creating {
+val lib by configurations.creating {
+    isTransitive = false
     isCanBeResolved = true
     isCanBeConsumed = true
-    isTransitive = false
-}
-
-val plugins_lib_ext by configurations.creating {
-    extendsFrom(jmeterlibs)
-}
-val plugins_lib by configurations.creating {
-    extendsFrom(jmeterlibs)
 }
 val lib_ext by configurations.creating {
-    extendsFrom(jmeterlibs)
-}
-val lib_log4j by configurations.creating {
-    extendsFrom(jmeterlibs)
+    isTransitive = false
+    isCanBeResolved = true
+    isCanBeConsumed = true
 }
+
 //plugins/lib/ext
 dependencies {
-    plugins_lib_ext("com.datadoghq:jmeter-datadog-backend-listener:0.3.0")
-    plugins_lib_ext("kg.apc:jmeter-plugins-casutg:2.10")
-    plugins_lib_ext("com.blazemeter:jmeter-plugins-random-csv-data-set:0.8")
-    plugins_lib_ext("com.microsoft.sqlserver:mssql-jdbc:10.2.1.jre17")
-    plugins_lib_ext("com.oracle.database.jdbc:ojdbc10:19.14.0.0")
-    plugins_lib_ext("kg.apc:jmeter-plugins-functions:2.1")
+    lib_ext("com.datadoghq:jmeter-datadog-backend-listener:0.3.0")
+    lib_ext("kg.apc:jmeter-plugins-casutg:2.10")
+    lib_ext("com.blazemeter:jmeter-plugins-random-csv-data-set:0.8")
+    lib_ext("com.microsoft.sqlserver:mssql-jdbc:10.2.1.jre17")
+    lib_ext("com.oracle.database.jdbc:ojdbc10:19.14.0.0")
+    lib_ext("kg.apc:jmeter-plugins-functions:2.1")
     // remove log4j shell
-    plugins_lib_ext("org.apache.logging.log4j:log4j-slf4j-impl:2.17.2")
-    plugins_lib_ext("org.apache.logging.log4j:log4j-api:2.17.2")
-    plugins_lib_ext("org.apache.logging.log4j:log4j-core:2.17.2")
+    lib_ext("org.apache.logging.log4j:log4j-slf4j-impl:2.17.2")
+    lib_ext("org.apache.logging.log4j:log4j-api:2.17.2")
+    lib_ext("org.apache.logging.log4j:log4j-core:2.17.2")
+
+    lib_ext("org.mozilla:rhino-engine:1.7.13")
 
 //plugins/lib
-    plugins_lib("kg.apc:cmdrunner:2.3")
-    plugins_lib("kg.apc:jmeter-plugins-cmn-jmeter:0.7")
-    plugins_lib("net.sf.json-lib:json-lib:2.4:jdk15")
+    lib("kg.apc:cmdrunner:2.3")
+    lib("kg.apc:jmeter-plugins-cmn-jmeter:0.7")
+    lib("net.sf.json-lib:json-lib:2.4:jdk15")
     // remove log4j shell
-    plugins_lib("org.apache.logging.log4j:log4j-slf4j-impl:2.17.2")
-    plugins_lib("org.apache.logging.log4j:log4j-api:2.17.2")
-    plugins_lib("org.apache.logging.log4j:log4j-core:2.17.2")
-
-//lib/ext
-    lib_ext("org.mozilla:rhino-engine:1.7.13")
+    lib("org.apache.logging.log4j:log4j-slf4j-impl:2.17.2")
+    lib("org.apache.logging.log4j:log4j-api:2.17.2")
+    lib("org.apache.logging.log4j:log4j-core:2.17.2")
 
 // apache log4j
-    lib_log4j("org.apache.logging.log4j:log4j-1.2-api:2.17.2")
-    lib_log4j("org.apache.logging.log4j:log4j-api:2.17.2")
-    lib_log4j("org.apache.logging.log4j:log4j-core:2.17.2")
-    lib_log4j("org.apache.logging.log4j:log4j-slf4j-impl:2.17.2")
+    lib("org.apache.logging.log4j:log4j-1.2-api:2.17.2")
+    lib("org.apache.logging.log4j:log4j-api:2.17.2")
+    lib("org.apache.logging.log4j:log4j-core:2.17.2")
+    lib("org.apache.logging.log4j:log4j-slf4j-impl:2.17.2")
 }
 
 repositories {
@@ -55,18 +47,12 @@ repositories {
 
 tasks {
     register<Copy>("copyPluginsLibExt") {
-        from(plugins_lib_ext) {
-            into("plugins/lib/ext")
-        }
-        from(plugins_lib) {
-            into("plugins/lib")
+        from(lib) {
+            into("lib")
         }
         from(lib_ext) {
             into("lib/ext")
         }
-        from(lib_log4j) {
-            into("lib")
-        }
         into(layout.buildDirectory.dir("jmeter"))
     }
 }