Author: pmouawad
Date: Sun Feb 5 13:55:33 2017
New Revision: 1781763
URL: http://svn.apache.org/viewvc?rev=1781763&view=rev
Log:
Bug 60589 - Migrate LogKit to SLF4J - Drop avalon, logkit and excalibur with
backward compatibility for 3rd party modules
Part 8 of PR 254
This closes #254
Contributed by Woonsan Ko
Bugzilla Id: 60589
Added:
jmeter/trunk/licenses/bin/jcl-over-slf4j-1.7.22.txt (with props)
jmeter/trunk/licenses/bin/slf4j-ext-1.7.22.txt (with props)
Modified:
jmeter/trunk/LICENSE
jmeter/trunk/build.properties
jmeter/trunk/build.xml
jmeter/trunk/eclipse.classpath
jmeter/trunk/lib/ (props changed)
jmeter/trunk/lib/aareadme.txt
jmeter/trunk/licenses/bin/README.txt
jmeter/trunk/res/maven/ApacheJMeter_parent.pom
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/jmeter/trunk/LICENSE?rev=1781763&r1=1781762&r2=1781763&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Sun Feb 5 13:55:33 2017
@@ -210,7 +210,6 @@ The following software is provided under
- Software produced at the ASF:
* apache-bsf-2.4.0.jar
-* avalon-framework-4.1.4.jar
* commons-codec-1.10.jar
* commons-collections-3.2.2.jar
* commons-dbcp2-2.1.1.jar
@@ -219,11 +218,9 @@ The following software is provided under
* commons-jexl2-2.1.1.jar
* commons-jexl3-3.0.jar
* commons-lang3-3.5.jar
-* commons-logging-1.2.jar
* commons-math3-3.6.1.jar
* commons-net-3.5.jar
* commons-pool2-2.4.2.jar
-* excalibur-logger-1.1.jar
* groovy-all-2.4.8.jar
* httpasyncclient-4.1.2.jar
* httpclient-4.5.3.jar
@@ -232,7 +229,10 @@ The following software is provided under
* httpmime-4.5.3.jar
* jakarta-oro-2.0.8.jar
* jms-1.1.1.jar
-* logkit-2.0.jar
+* log4j-1.2-api-2.7.jar
+* log4j-api-2.7.jar
+* log4j-core-2.7.jar
+* log4j-slf4j-impl-2.7.jar
* serializer-2.7.2.jar
* startbootstrap-sb-admin-2-1.0.7
* tika-core-1.14.jar
@@ -262,6 +262,7 @@ For details, please see the files under:
* hamcrest-core-1.3.jar (BSD)
* javamail-1.5.0-b01.jar (CDDL Version 1.0)
* jcharts-0.7.5.jar (?)
+* jcl-over-slf4j-1.7.22.jar (MIT)
* jsoup-1.10.2.jar (MIT)
* jodd-core-3.8.1.jar (Simplified BSD)
* jodd-lagarto-3.8.1.jar (Simplified BSD)
@@ -272,6 +273,7 @@ For details, please see the files under:
* rhino-1.7.7.1.jar (MPL 2.0)
* rsyntaxtextarea-2.6.0.jar (BSD)
* slf4j-api-1.7.22.jar (MIT)
+* slf4j-ext-1.7.22.jar (MIT)
* xmlpull-1.1.3.1.jar (Public Domain)
* xpp3-1.1.4c.jar (Indiana University Extreme! Lab Software License 1.1.1)
* xstream-1.4.9.jar (BSD)
Modified: jmeter/trunk/build.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1781763&r1=1781762&r2=1781763&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Feb 5 13:55:33 2017
@@ -57,11 +57,6 @@ asm.jar = asm-${asm.
asm.loc = ${maven2.repo}/org/ow2/asm/asm/${asm.version}
asm.md5 = 8bb8efe7c0f8488c4a2d6297066632aa
-avalon-framework.version = 4.1.4
-avalon-framework.jar = avalon-framework-${avalon-framework.version}.jar
-avalon-framework.loc =
${maven2.repo}/avalon-framework/avalon-framework/${avalon-framework.version}
-avalon-framework.md5 = 2C5306A09B22BD06A78343C0B55D021F
-
beanshell.version = 2.0b5
beanshell.jar = bsh-${beanshell.version}.jar
beanshell.loc =
${maven2.repo}/org/beanshell/bsh/${beanshell.version}
@@ -130,13 +125,6 @@ commons-lang3.jar = commons-la
commons-lang3.loc =
${maven2.repo}/org/apache/commons/commons-lang3/${commons-lang3.version}
commons-lang3.md5 = 780b5a8b72eebe6d0dbff1c11b5658fa
-commons-logging.version = 1.2
-commons-logging.jar = commons-logging-${commons-logging.version}.jar
-commons-logging.loc =
${maven2.repo}/commons-logging/commons-logging/${commons-logging.version}
-# Checksum from binary release and Maven differ, but contents of jar are
identical
-#commons-logging.md5 = E2C390FE739B2550A218262B28F290CE
-commons-logging.md5 = 040b4b4d8eac886f6b4a2a3bd2f31b00
-
commons-math3.version = 3.6.1
commons-math3.jar = commons-math3-${commons-math3.version}.jar
commons-math3.loc =
${maven2.repo}/org/apache/commons/commons-math3/${commons-math3.version}
@@ -158,11 +146,6 @@ dnsjava.jar = dnsjava-${
dnsjava.loc = ${maven2.repo}/dnsjava/dnsjava/${dnsjava.version}
dnsjava.md5 = 540f330717bca9d29c8762cf6daca443
-excalibur-logger.version = 1.1
-excalibur-logger.jar = excalibur-logger-${excalibur-logger.version}.jar
-excalibur-logger.loc =
${maven2.repo}/excalibur-logger/excalibur-logger/${excalibur-logger.version}
-excalibur-logger.md5 = E8246C546B7B0CAFD65947E9B80BB884
-
# Freemarker
freemarker.version = 2.3.23
freemarker.loc =
${maven2.repo}/org/freemarker/freemarker/${freemarker.version}
@@ -267,11 +250,6 @@ junit.jar = junit-${ju
junit.loc = ${maven2.repo}/junit/junit/${junit.version}
junit.md5 = 5b38c40c97fbd0adee29f91e60405584
-logkit.version = 2.0
-logkit.jar = logkit-${logkit.version}.jar
-logkit.loc = ${maven2.repo}/logkit/logkit/${logkit.version}
-logkit.md5 = 8D82A3E91AAE216D0A2A40B837A232FF
-
mongo-java-driver.version = 2.11.3
mongo-java-driver.jar =
mongo-java-driver-${mongo-java-driver.version}.jar
mongo-java-driver.loc =
${maven2.repo}/org/mongodb/mongo-java-driver/${mongo-java-driver.version}
@@ -297,6 +275,36 @@ slf4j-api.jar = slf4j-api-
slf4j-api.loc =
${maven2.repo}/org/slf4j/slf4j-api/${slf4j-api.version}
slf4j-api.md5 = 897d990eb5463fd5288092524c105769
+slf4j-ext.version = 1.7.22
+slf4j-ext.jar = slf4j-ext-${slf4j-ext.version}.jar
+slf4j-ext.loc =
${maven2.repo}/org/slf4j/slf4j-ext/${slf4j-ext.version}
+slf4j-ext.md5 = 678bd7971ad51b53d147eced7a42bb64
+
+jcl-over-slf4j.version = 1.7.22
+jcl-over-slf4j.jar = jcl-over-slf4j-${jcl-over-slf4j.version}.jar
+jcl-over-slf4j.loc =
${maven2.repo}/org/slf4j/jcl-over-slf4j/${jcl-over-slf4j.version}
+jcl-over-slf4j.md5 = 87f0c69f2d86475c9dc8cfbde270fa4e
+
+log4j-api.version = 2.7
+log4j-api.jar = log4j-api-${log4j-api.version}.jar
+log4j-api.loc =
${maven2.repo}/org/apache/logging/log4j/log4j-api/${log4j-api.version}
+log4j-api.md5 = 8c6059adc8248076dfbfec5b875ead3d
+
+log4j-core.version = 2.7
+log4j-core.jar = log4j-core-${log4j-core.version}.jar
+log4j-core.loc =
${maven2.repo}/org/apache/logging/log4j/log4j-core/${log4j-core.version}
+log4j-core.md5 = 2b63e0e5063fdaccf669a1e26384f3fd
+
+log4j-1.2-api.version = 2.7
+log4j-1.2-api.jar = log4j-1.2-api-${log4j-1.2-api.version}.jar
+log4j-1.2-api.loc =
${maven2.repo}/org/apache/logging/log4j/log4j-1.2-api/${log4j-1.2-api.version}
+log4j-1.2-api.md5 = fb4cfd8dd851f0811be4cde61112d8ed
+
+log4j-slf4j-impl.version = 2.7
+log4j-slf4j-impl.jar = log4j-slf4j-impl-${log4j-slf4j-impl.version}.jar
+log4j-slf4j-impl.loc =
${maven2.repo}/org/apache/logging/log4j/log4j-slf4j-impl/${log4j-slf4j-impl.version}
+log4j-slf4j-impl.md5 = caf39fb2a3a8e1ca14ec89e4abaf2b79
+
sonarqube-ant-task.version = 2.5
sonarqube-ant-task.jar =
sonarqube-ant-task-${sonarqube-ant-task.version}.jar
sonarqube-ant-task.loc =
${maven2.repo}/org/sonarsource/scanner/ant/sonarqube-ant-task/${sonarqube-ant-task.version}
Modified: jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1781763&r1=1781762&r2=1781763&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Feb 5 13:55:33 2017
@@ -145,7 +145,6 @@
<sourcePath path="${src.components}" />
<sourcePath path="${src.functions}" />
<class location="${lib.dir}/jorphan.jar" />
- <class location="${lib.dir}/ApacheJMeter_slf4j_logkit.jar"/>
<class location="${dest.jar}/ApacheJMeter_components.jar"/>
<class location="${dest.jar}/ApacheJMeter_components.jar"/>
<class location="${dest.jar}/ApacheJMeter_core.jar"/>
@@ -162,7 +161,6 @@
<class location="${dest.jar}/ApacheJMeter_mongodb.jar"/>
<class location="${dest.jar}/ApacheJMeter_tcp.jar"/>
<class location="${dest.jar.jmeter}/ApacheJMeter.jar" />
- <sourcePath path="${src.slf4j_logkit}" />
<sourcePath path="${src.jorphan}" />
<sourcePath path="${src.tcp}" />
<sourcePath path="${src.jms}" />
@@ -229,7 +227,6 @@
<property name="src.jms" value="src/protocol/jms"/>
<property name="src.native" value="src/protocol/native"/>
<property name="src.mongodb" value="src/protocol/mongodb"/>
- <property name="src.slf4j_logkit" value="src/slf4j-logkit"/>
<!-- Where the documentation sources live -->
<property name="src.docs" value="xdocs"/>
@@ -255,7 +252,6 @@
<pathelement location="${src.jms}"/>
<pathelement location="${src.native}"/>
<pathelement location="${src.mongodb}"/>
- <pathelement location="${src.slf4j_logkit}"/>
</path>
<!-- Temporary build directories: where the .class live -->
@@ -276,7 +272,6 @@
<property name="build.jms" value="build/protocol/jms"/>
<property name="build.native" value="build/protocol/native"/>
<property name="build.mongodb" value="build/protocol/mongodb"/>
- <property name="build.slf4j_logkit" value="build/slf4j-logkit"/>
<property name="build.test" value="build/test"/>
<property name="build.res" value="build/res"/>
<property name="build.test-res" value="test/resources"/>
@@ -383,7 +378,6 @@
<include name="${lib.dir}/${accessors-smart.jar}"/>
<include name="${lib.dir}/${apache-bsf.jar}"/>
<include name="${lib.dir}/${asm.jar}"/>
- <include name="${lib.dir}/${avalon-framework.jar}"/>
<include name="${lib.dir}/${beanshell.jar}"/>
<include name="${lib.dir}/${caffeine.jar}"/>
<include name="${lib.dir}/${commons-codec.jar}"/>
@@ -394,12 +388,10 @@
<include name="${lib.dir}/${commons-jexl2.jar}"/>
<include name="${lib.dir}/${commons-jexl3.jar}"/>
<include name="${lib.dir}/${commons-lang3.jar}"/>
- <include name="${lib.dir}/${commons-logging.jar}"/>
<include name="${lib.dir}/${commons-math3.jar}"/>
<include name="${lib.dir}/${commons-net.jar}"/>
<include name="${lib.dir}/${commons-pool2.jar}"/>
<include name="${lib.dir}/${dnsjava.jar}"/>
- <include name="${lib.dir}/${excalibur-logger.jar}"/>
<include name="${lib.dir}/${freemarker.jar}"/>
<include name="${lib.dir}/${groovy-all.jar}"/>
<include name="${lib.dir}/${hamcrest-core.jar}"/>
@@ -411,6 +403,7 @@
<include name="${lib.dir}/${jakarta-oro.jar}"/>
<include name="${lib.dir}/${javamail.jar}"/>
<include name="${lib.dir}/${jcharts.jar}"/>
+ <include name="${lib.dir}/${jcl-over-slf4j.jar}"/>
<include name="${lib.dir}/${jms.jar}"/>
<include name="${lib.dir}/${rhino.jar}"/>
<include name="${lib.dir}/${jodd-core.jar}"/>
@@ -421,13 +414,14 @@
<include name="${lib.dir}/${json-smart.jar}"/>
<include name="${lib.dir}/${jsoup.jar}"/>
<include name="${lib.dir}/${junit.jar}"/>
- <include name="${lib.dir}/${logkit.jar}"/>
<include name="${lib.dir}/${mongo-java-driver.jar}"/>
<include name="${lib.dir}/${ph-css.jar}"/>
<include name="${lib.dir}/${ph-commons.jar}"/>
<include name="${lib.dir}/${rsyntaxtextarea.jar}"/>
<include name="${lib.dir}/${serializer.jar}"/>
<include name="${lib.dir}/${slf4j-api.jar}"/>
+ <include name="${lib.dir}/${slf4j-ext.jar}"/>
+ <include name="${lib.dir}/${log4j-api.jar}"/>
<include name="${lib.dir}/${jtidy.jar}"/>
<include name="${lib.dir}/${tika-core.jar}"/>
<include name="${lib.dir}/${tika-parsers.jar}"/>
@@ -462,7 +456,6 @@
<pathelement location="${lib.dir}/${accessors-smart.jar}"/>
<pathelement location="${lib.dir}/${apache-bsf.jar}"/>
<pathelement location="${lib.dir}/${asm.jar}"/>
- <pathelement location="${lib.dir}/${avalon-framework.jar}"/>
<pathelement location="${lib.dir}/${beanshell.jar}"/>
<pathelement location="${lib.dir}/${caffeine.jar}"/>
<pathelement location="${lib.dir}/${commons-codec.jar}"/>
@@ -473,12 +466,10 @@
<pathelement location="${lib.dir}/${commons-jexl2.jar}"/>
<pathelement location="${lib.dir}/${commons-jexl3.jar}"/>
<pathelement location="${lib.dir}/${commons-lang3.jar}"/>
- <pathelement location="${lib.dir}/${commons-logging.jar}"/>
<pathelement location="${lib.dir}/${commons-math3.jar}"/>
<pathelement location="${lib.dir}/${commons-net.jar}"/>
<pathelement location="${lib.dir}/${commons-pool2.jar}"/>
<pathelement location="${lib.dir}/${dnsjava.jar}"/>
- <pathelement location="${lib.dir}/${excalibur-logger.jar}"/>
<pathelement location="${lib.dir}/${freemarker.jar}"/>
<pathelement location="${lib.dir}/${groovy-all.jar}"/>
<pathelement location="${lib.dir}/${hamcrest-core.jar}"/>
@@ -500,13 +491,13 @@
<pathelement location="${lib.dir}/${json-smart.jar}"/>
<pathelement location="${lib.dir}/${jsoup.jar}"/>
<pathelement location="${lib.dir}/${junit.jar}"/>
- <pathelement location="${lib.dir}/${logkit.jar}"/>
<pathelement location="${lib.dir}/${mongo-java-driver.jar}"/>
<pathelement location="${lib.dir}/${ph-css.jar}"/>
<pathelement location="${lib.dir}/${ph-commons.jar}"/>
<pathelement location="${lib.dir}/${rsyntaxtextarea.jar}"/>
<pathelement location="${lib.dir}/${serializer.jar}"/>
<pathelement location="${lib.dir}/${slf4j-api.jar}"/>
+ <pathelement location="${lib.dir}/${slf4j-ext.jar}"/>
<pathelement location="${lib.dir}/${jtidy.jar}"/>
<pathelement location="${lib.dir}/${tika-core.jar}"/>
<pathelement location="${lib.dir}/${tika-parsers.jar}"/>
@@ -519,17 +510,19 @@
<pathelement location="${lib.dir}/${xstream.jar}"/>
<!-- Generated jars -->
<fileset dir="${lib.dir}" includes="jorphan.jar"/>
- <fileset dir="${lib.dir}" includes="ApacheJMeter_slf4j_logkit.jar"/>
<!-- API-only jars-->
<fileset dir="${lib.api}" includes="*.jar"/>
<!-- Optional jars -->
<fileset dir="${lib.opt}" includes="*.jar"/>
</path>
- <path id="slf4j_logkit_classpath">
- <!-- Externally produced jars -->
- <pathelement location="${lib.dir}/${logkit.jar}"/>
- <pathelement location="${lib.dir}/${slf4j-api.jar}"/>
+ <!-- Logging classpath -->
+ <path id="logging.classpath">
+ <pathelement location="${lib.dir}/${jcl-over-slf4j.jar}"/>
+ <pathelement location="${lib.dir}/${log4j-api.jar}"/>
+ <pathelement location="${lib.dir}/${log4j-core.jar}"/>
+ <pathelement location="${lib.dir}/${log4j-1.2-api.jar}"/>
+ <pathelement location="${lib.dir}/${log4j-slf4j-impl.jar}"/>
</path>
<!-- Anakia classpath -->
@@ -538,7 +531,6 @@
<pathelement location="${lib.doc}/${jdom.jar}"/>
<pathelement location="${lib.dir}/${commons-collections.jar}"/>
<pathelement location="${lib.doc}/${commons-lang.jar}"/>
- <pathelement location="${lib.dir}/${logkit.jar}"/>
</path>
<!-- Version info filter set -->
@@ -633,7 +625,9 @@
<include name="**/*.java"/>
<classpath>
<pathelement location="${build.jorphan}"/>
+ <pathelement location="${lib.dir}/${log4j-core.jar}"/>
<path refid="classpath"/>
+ <path refid="logging.classpath"/>
</classpath>
</javac>
</target>
@@ -675,6 +669,9 @@
<pathelement location="${build.core}"/>
<pathelement location="${build.components}"/>
<path refid="classpath"/>
+ <pathelement location="${lib.dir}/${jcl-over-slf4j.jar}"/>
+ <pathelement location="${lib.dir}/${log4j-api.jar}"/>
+ <pathelement location="${lib.dir}/${log4j-core.jar}"/>
</classpath>
</javac>
</target>
@@ -699,6 +696,7 @@
<!-- Also include compiled jars to allow running tests without
rebuilding source -->
<fileset dir="${dest.jar}" includes="*.jar"/>
<path refid="classpath"/>
+ <path refid="logging.classpath"/>
</classpath>
</javac>
</target>
@@ -825,17 +823,6 @@
</javac>
</target>
- <target name="compile-slf4j_logkit" description="Compile JMeter slf4j LogKit
bootstrap classes.">
- <mkdir dir="${build.slf4j_logkit}"/>
- <javac srcdir="${src.slf4j_logkit}" destdir="${build.slf4j_logkit}"
source="${src.java.version}" optimize="${optimize}" debug="on"
target="${target.java.version}"
- includeAntRuntime="${includeAntRuntime}"
deprecation="${deprecation}" encoding="${encoding}">
- <include name="**/*.java"/>
- <classpath>
- <path refid="slf4j_logkit_classpath"/>
- </classpath>
- </javac>
- </target>
-
<target name="compile-jms"
depends="compile-jorphan,compile-core,compile-components"
description="Compile components specific to JMS sampling.">
<mkdir dir="${build.jms}"/>
@@ -879,7 +866,7 @@
</target>
<target name="compile"
-
depends="_message_3rdParty,compile-slf4j_logkit,compile-core,compile-components,compile-functions,compile-protocols,compile-junit,compile-jms,compile-native,
compile-mongodb"
+
depends="_message_3rdParty,compile-core,compile-components,compile-functions,compile-protocols,compile-junit,compile-jms,compile-native,
compile-mongodb"
description="Compile everything."/>
<target name="run_gui" depends="package" description="Run the JMeter GUI off
the jar files">
@@ -1160,18 +1147,6 @@ run JMeter unless all the JMeter jars ar
<fileset dir="${src.mongodb}" includes="**/*.properties" />
</jar>
- <!-- slf4j-logkit -->
- <!-- Ensure that build dir exists, even if slf4j-logkit has not been built
-->
- <mkdir dir="${build.slf4j_logkit}"/>
- <jar jarfile="${lib.dir}/ApacheJMeter_slf4j_logkit.jar"
manifest="${build.dir}/MANIFEST_BIN.MF">
- <zipfileset file="${resources.meta-inf}/default.notice"
- fullpath="META-INF/NOTICE" />
- <zipfileset file="${resources.meta-inf}/default.license"
- fullpath="META-INF/LICENSE" />
- <fileset dir="${build.slf4j_logkit}" includes="**/*.class" />
- <fileset dir="${src.slf4j_logkit}" includes="**/*.properties" />
- </jar>
-
<jar jarfile="${lib.dir}/jorphan.jar"
manifest="${build.dir}/MANIFEST_BIN.MF">
<zipfileset file="${resources.meta-inf}/default.notice"
fullpath="META-INF/NOTICE" />
@@ -1242,8 +1217,7 @@ run JMeter unless all the JMeter jars ar
<include name="${dest.jar.jmeter}/krb5.conf"/>
<include name="${dest.jar.jmeter}/hc.parameters"/>
<include name="${dest.jar.jmeter}/jmeter.properties"/>
- <include name="${dest.jar.jmeter}/log4j.conf"/>
- <include name="${dest.jar.jmeter}/logkit.xml"/>
+ <include name="${dest.jar.jmeter}/log4j2.xml"/>
<include name="${dest.jar.jmeter}/reportgenerator.properties"/>
<include name="${dest.jar.jmeter}/upgrade.properties"/>
<include name="${dest.jar.jmeter}/saveservice.properties"/>
@@ -1323,7 +1297,6 @@ run JMeter unless all the JMeter jars ar
<include name="${dest.jar}/"/>
<include name="${lib.dir}/bshclient.jar"/>
<include name="${lib.dir}/jorphan.jar"/>
- <include name="${lib.dir}/ApacheJMeter_slf4j_logkit.jar"/>
<include name="${lib.dir}/junit/test.jar"/>
<include name="${dest.jar.jmeter}/ApacheJMeter.jar"/>
<!-- Help documentation, binary files -->
@@ -1631,7 +1604,6 @@ run JMeter unless all the JMeter jars ar
<fileset dir="${dest.jar}" includes="ApacheJMeter*.jar"/>
<fileset dir="${dest.jar.jmeter}" includes="ApacheJMeter.jar"/>
<fileset dir="${lib.dir}" includes="jorphan.jar"/>
- <fileset dir="${lib.dir}" includes="ApacheJMeter_slf4j_logkit.jar"/>
</copy>
<copy tofile="${maven.dir}/ApacheJMeter_junit-test.jar"
file="${lib.dir}/junit/test.jar"/>
<!--
@@ -1649,8 +1621,7 @@ run JMeter unless all the JMeter jars ar
<zipfileset dir="${dest.jar.jmeter}" prefix="bin"
includes="*.properties"/>
<zipfileset dir="${dest.jar.jmeter}" prefix="bin" includes="jaas.conf"/>
<zipfileset dir="${dest.jar.jmeter}" prefix="bin" includes="krb5.conf"/>
- <zipfileset dir="${dest.jar.jmeter}" prefix="bin" includes="log4j.conf"/>
- <zipfileset dir="${dest.jar.jmeter}" prefix="bin" includes="logkit.xml"/>
+ <zipfileset dir="${dest.jar.jmeter}" prefix="bin" includes="log4j2.xml"/>
<zipfileset dir="${dest.jar.jmeter}" prefix="bin"
includes="proxyserver.jks"/>
<zipfileset dir="${dest.jar.jmeter}" prefix="bin" includes="users.dtd"/>
<zipfileset dir="${dest.jar.jmeter}" prefix="bin" includes="users.xml"/>
@@ -1673,7 +1644,7 @@ run JMeter unless all the JMeter jars ar
<pathelement location="${lib.dir}/${beanshell.jar}"/>
<!-- Needed to work with Java 1.5 -->
<pathelement location="${lib.dir}/${apache-bsf.jar}"/>
- <pathelement location="${lib.dir}/${commons-logging.jar}"/>
+ <pathelement location="${lib.dir}/${jcl-over-slf4j.jar}"/>
</classpath>
<!-- type of script to create: upload, publish or delete -->
<attribute name="type"/>
@@ -2012,7 +1983,6 @@ run JMeter unless all the JMeter jars ar
<deployfile stem="ApacheJMeter_parent" packaging="pom"/>
<deployfile stem="jorphan"/>
- <deployfile stem="ApacheJMeter_slf4j_logkit"/>
<deployfile stem="ApacheJMeter"/>
<deployfile stem="ApacheJMeter_components"/>
<deployfile stem="ApacheJMeter_config"/>
@@ -2250,7 +2220,6 @@ run JMeter unless all the JMeter jars ar
<delete quiet="false" failonerror="false">
<fileset dir="${dest.jar.jmeter}" includes="ApacheJMeter.jar"/>
<fileset dir="${lib.dir}" includes="jorphan.jar"/>
- <fileset dir="${lib.dir}" includes="ApacheJMeter_slf4j_logkit.jar"/>
<fileset dir="${lib.dir}" includes="bshclient.jar"/>
<fileset dir="${dest.jar}" includes="*.jar"/>
<fileset dir="${build.dir}"/>
@@ -2455,6 +2424,7 @@ run JMeter unless all the JMeter jars ar
<fileset dir="${dest.jar.jmeter}" includes="*.jar"/>
<fileset dir="${dest.jar}" includes="*.jar"/>
<path refid="classpath"/>
+ <path refid="logging.classpath"/>
</classpath>
<jvmarg value="${jacoco_params}batchtest:daemon:java(server)"/>
<sysproperty key="java.awt.headless" value="true"/>
@@ -2465,6 +2435,8 @@ run JMeter unless all the JMeter jars ar
<arg value="-qjmeter.properties"/>
<!-- reset the logging and other parameters -->
<arg value="-qtestfiles/jmeter-batch.properties"/>
+ <arg value="-i"/>
+ <arg value="testfiles/log4j2-batch.xml"/>
<arg value="-j"/>
<arg value="${batchtestserver.out}/${batchtestserver.log}"/>
<arg value="-Dserver_port=${rmi_port}"/>
@@ -2562,6 +2534,7 @@ run JMeter unless all the JMeter jars ar
<fileset dir="${dest.jar.jmeter}" includes="*.jar"/>
<fileset dir="${dest.jar}" includes="*.jar"/>
<path refid="classpath"/>
+ <path refid="logging.classpath"/>
</classpath>
<jvmarg value="${jacoco_params}batchtest:java(${taskname})"/>
<!-- Detect if non-GUI runs OK headless by forcing it to try using
non-headless mode -->
@@ -2577,6 +2550,8 @@ run JMeter unless all the JMeter jars ar
<arg value="-qtestfiles/jmeter-batch.properties"/>
<arg value="-n"/>
<arg value="-ttestfiles/${batchtest.name}.jmx"/>
+ <arg value="-i"/>
+ <arg value="testfiles/log4j2-batch.xml"/>
<arg value="-j"/>
<arg value="${batchtest.name}.log"/>
<arg value="-l"/>
@@ -2777,6 +2752,7 @@ run JMeter unless all the JMeter jars ar
<pathelement location="${build.test}"/>
<pathelement location="${build.test-res}"/>
<path refid="classpath"/>
+ <path refid="logging.classpath"/>
</classpath>
<jvmarg value="-server"/>
<jvmarg value="${jacoco_params}_test:java"/>
@@ -2784,6 +2760,7 @@ run JMeter unless all the JMeter jars ar
<sysproperty key="java.awt.headless" value="${test.headless}"/>
<sysproperty key="testsaveservice.saveout"
value="${testsaveservice.saveout}" />
<sysproperty key="gump.run" value="${gump.run}" />
+ <sysproperty key="log4j.configurationFile"
value="${basedir}/bin/log4j2.xml" />
<arg value="${build.test}"/>
<arg value="${basedir}/bin/jmeter.properties"/>
<arg value="org.apache.jmeter.util.JMeterUtils"/>
@@ -2817,6 +2794,7 @@ run JMeter unless all the JMeter jars ar
<fileset dir="${dest.jar}" includes="*.jar"/>
<pathelement location="${build.test}"/>
<path refid="classpath"/>
+ <path refid="logging.classpath"/>
</classpath>
<test name="${test.case}" todir="reports"/>
</junit>
@@ -2847,6 +2825,7 @@ run JMeter unless all the JMeter jars ar
<pathelement location="${build.test}"/>
<pathelement location="${build.test-res}"/>
<path refid="classpath"/>
+ <path refid="logging.classpath"/>
</classpath>
<batchtest todir="reports" skipNonTests="true">
<fileset dir="${src.test}">
@@ -2947,7 +2926,8 @@ run JMeter unless all the JMeter jars ar
<filterchain>
<tokenfilter>
<filetokenizer/>
- <replaceregex pattern="-\d+\.\d+.*(\.jar|\.zip)" replace="-*\1"/>
+ <!-- Replace version with a wildcard. e.g, foo-1.2.3.jar or
foo-1.2.3.RELEASE.jar to foo-*.jar -->
+ <replaceregex pattern="-(\d+\.){2,}([A-Za-z]+\.)?(jar|zip)"
replace="-*\1"/>
</tokenfilter>
</filterchain>
</loadresource>
@@ -3023,7 +3003,6 @@ run JMeter unless all the JMeter jars ar
<process_jarfile jarname="accessors-smart"/>
<process_jarfile jarname="apache-bsf"/>
<process_jarfile jarname="asm"/>
- <process_jarfile jarname="avalon-framework"/>
<process_jarfile jarname="bcmail" dest.dir="${lib.api}"/>
<process_jarfile jarname="bcprov" dest.dir="${lib.api}"/>
<process_jarfile jarname="bcpkix" dest.dir="${lib.api}"/>
@@ -3037,12 +3016,10 @@ run JMeter unless all the JMeter jars ar
<process_jarfile jarname="commons-jexl2"/>
<process_jarfile jarname="commons-jexl3"/>
<process_jarfile jarname="commons-lang3"/>
- <process_jarfile jarname="commons-logging"/>
<process_jarfile jarname="commons-math3"/>
<process_jarfile jarname="commons-net"/>
<process_jarfile jarname="commons-pool2"/>
<process_jarfile jarname="dnsjava"/>
- <process_jarfile jarname="excalibur-logger"/>
<process_jarfile jarname="freemarker"/>
<process_jarfile jarname="groovy-all"/>
<process_jarfile jarname="hamcrest-core"/>
@@ -3065,13 +3042,18 @@ run JMeter unless all the JMeter jars ar
<process_jarfile jarname="json-smart"/>
<process_jarfile jarname="jsoup"/>
<process_jarfile jarname="junit"/>
- <process_jarfile jarname="logkit"/>
<process_jarfile jarname="mongo-java-driver"/>
<process_jarfile jarname="ph-css" />
<process_jarfile jarname="ph-commons" />
<process_jarfile jarname="rsyntaxtextarea"/>
<process_jarfile jarname="serializer"/>
<process_jarfile jarname="slf4j-api"/>
+ <process_jarfile jarname="slf4j-ext"/>
+ <process_jarfile jarname="jcl-over-slf4j"/>
+ <process_jarfile jarname="log4j-api"/>
+ <process_jarfile jarname="log4j-core"/>
+ <process_jarfile jarname="log4j-1.2-api"/>
+ <process_jarfile jarname="log4j-slf4j-impl"/>
<process_jarfile jarname="jtidy"/>
<process_jarfile jarname="tika-core"/>
<process_jarfile jarname="tika-parsers"/>
@@ -3119,12 +3101,19 @@ run JMeter unless all the JMeter jars ar
<delete verbose="true">
<!-- bcprov jars no longer have the same prefix so the wildcard delete
does not work; drop any old ones -->
<fileset dir="${lib.api}" includes="bcmail-jdk15-*.jar
bcprov-jdk15-*.jar"/>
+ <fileset dir="${lib.dir}" includes="ApacheJMeter_slf4j_logkit.jar" />
<!-- tidy up unused Excalibur jars -->
- <fileset dir="${lib.dir}" includes="htmllexer-2.1.jar htmlparser-2.1.jar
excalibur-datasource-2.1.jar excalibur-instrument-1.0.jar
excalibur-pool-api-2.1.jar excalibur-pool-impl-2.1.jar
excalibur-pool-instrumented-2.1.jar"/>
+ <fileset dir="${lib.dir}" includes="avalon-framework-4.1.4.jar
excalibur-datasource-2.1.jar excalibur-instrument-1.0.jar
excalibur-logger-1.1.jar excalibur-pool-api-2.1.jar excalibur-pool-impl-2.1.jar
excalibur-pool-instrumented-2.1.jar"/>
<!-- jdom jar has moved; drop the old one -->
<fileset dir="${lib.dir}" includes="jdom-1.1.3.jar"/>
<!-- Drop slf4j-nop implementation -->
<fileset dir="${lib.dir}" includes="slf4j-nop-1.7.13.jar"/>
+ <!-- tidy up unused commons-logging jar -->
+ <fileset dir="${lib.dir}" includes="commons-logging-1.2.jar"/>
+ <!-- tidy up unused htmlparser jars -->
+ <fileset dir="${lib.dir}" includes="htmllexer-2.1.jar
htmlparser-2.1.jar"/>
+ <!-- tidy up unused logkit jars -->
+ <fileset dir="${lib.dir}" includes="logkit-2.0.jar"/>
</delete>
<antcall target="_process_all_jars">
<param name="_get_file" value="true"/>
@@ -3190,7 +3179,6 @@ run JMeter unless all the JMeter jars ar
<fileset dir="${build.mongodb}"/>
<fileset dir="${build.native}"/>
<fileset dir="${build.tcp}"/>
- <fileset dir="${build.slf4j_logkit}"/>
<fileset dir="${build.test}"/>
</classfiles>
<sourcefiles encoding="${encoding}">
@@ -3209,7 +3197,6 @@ run JMeter unless all the JMeter jars ar
<fileset dir="${src.mongodb}"/>
<fileset dir="${src.native}"/>
<fileset dir="${src.tcp}"/>
- <fileset dir="${src.slf4j_logkit}"/>
<fileset dir="${src.test}"/>
</sourcefiles>
</structure>
Modified: jmeter/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1781763&r1=1781762&r2=1781763&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun Feb 5 13:55:33 2017
@@ -44,11 +44,9 @@
<classpathentry kind="src" output="build/protocol/mongodb"
path="src/protocol/mongodb"/>
<classpathentry kind="src" output="build/protocol/native"
path="src/protocol/native"/>
<classpathentry kind="src" output="build/protocol/tcp"
path="src/protocol/tcp"/>
- <classpathentry kind="src" output="build/slf4j-logkit"
path="src/slf4j-logkit"/>
<classpathentry kind="src" output="build/test" path="test/src"/>
<classpathentry kind="lib" path="lib/accessors-smart-1.1.jar"/>
<classpathentry kind="lib" path="lib/asm-5.2.jar"/>
- <classpathentry kind="lib" path="lib/avalon-framework-4.1.4.jar"/>
<classpathentry kind="lib" path="lib/bsf-2.4.0.jar"/>
<classpathentry kind="lib" path="lib/bsh-2.0b5.jar"/>
<classpathentry kind="lib" path="lib/caffeine-2.3.5.jar"/>
@@ -60,12 +58,10 @@
<classpathentry kind="lib" path="lib/commons-jexl-2.1.1.jar"/>
<classpathentry kind="lib" path="lib/commons-jexl3-3.0.jar"/>
<classpathentry kind="lib" path="lib/commons-lang3-3.5.jar"/>
- <classpathentry kind="lib" path="lib/commons-logging-1.2.jar"/>
<classpathentry kind="lib" path="lib/commons-math3-3.6.1.jar"/>
<classpathentry kind="lib" path="lib/commons-net-3.5.jar"/>
<classpathentry kind="lib" path="lib/commons-pool2-2.4.2.jar"/>
<classpathentry kind="lib" path="lib/dnsjava-2.1.8.jar"/>
- <classpathentry kind="lib" path="lib/excalibur-logger-1.1.jar"/>
<classpathentry kind="lib" path="lib/freemarker-2.3.23.jar"/>
<classpathentry kind="lib" path="lib/groovy-all-2.4.8.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
@@ -76,6 +72,7 @@
<classpathentry kind="lib" path="lib/httpcore-4.4.6.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.5.3.jar"/>
<classpathentry kind="lib" path="lib/jcharts-0.7.5.jar"/>
+ <classpathentry kind="lib" path="lib/jcl-over-slf4j-1.7.22.jar"/>
<classpathentry kind="lib" path="lib/jodd-core-3.8.1.jar"/>
<classpathentry kind="lib" path="lib/jodd-lagarto-3.8.1.jar"/>
<classpathentry kind="lib" path="lib/jodd-log-3.8.1.jar"/>
@@ -85,7 +82,6 @@
<classpathentry kind="lib" path="lib/jsoup-1.10.2.jar"/>
<classpathentry kind="lib" path="lib/jtidy-r938.jar"/>
<classpathentry kind="lib" path="lib/junit-4.12.jar"/>
- <classpathentry kind="lib" path="lib/logkit-2.0.jar"/>
<classpathentry kind="lib" path="lib/mail-1.5.0-b01.jar"/>
<classpathentry kind="lib" path="lib/mongo-java-driver-2.11.3.jar"/>
<classpathentry kind="lib" path="lib/ph-css-5.0.3.jar"/>
@@ -95,6 +91,11 @@
<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.6.0.jar"/>
<classpathentry kind="lib" path="lib/serializer-2.7.2.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.22.jar"/>
+ <classpathentry kind="lib" path="lib/slf4j-ext-1.7.22.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-api-2.7.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-core-2.7.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-slf4j-impl-2.7.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2-api-2.7.jar"/>
<classpathentry kind="lib" path="lib/tika-core-1.14.jar"/>
<classpathentry kind="lib" path="lib/tika-parsers-1.14.jar"/>
<classpathentry kind="lib" path="lib/xalan-2.7.2.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Feb 5 13:55:33 2017
@@ -3,7 +3,6 @@ src
accessors-smart-1.1.jar
ApacheJMeter_slf4j_logkit.jar
asm-5.2.jar
-avalon-framework-4.1.4.jar
bsf-2.4.0.jar
bsh-2.0b5.jar
bshclient.jar
@@ -16,12 +15,10 @@ commons-io-2.5.jar
commons-jexl-2.1.1.jar
commons-jexl3-3.0.jar
commons-lang3-3.5.jar
-commons-logging-1.2.jar
commons-math3-3.6.1.jar
commons-net-3.5.jar
commons-pool2-2.4.2.jar
dnsjava-2.1.8.jar
-excalibur-logger-1.1.jar
freemarker-2.3.23.jar
hamcrest-core-1.3.jar
geronimo*.jar
@@ -32,6 +29,7 @@ httpcore-4.4.6.jar
httpcore-nio-4.4.6.jar
httpmime-4.5.3.jar
jcharts-0.7.5.jar
+jcl-over-slf4j-1.7.22.jar
jms*.jar
jodd-core-3.8.1.jar
jodd-lagarto-3.8.1.jar
@@ -43,7 +41,10 @@ json-smart-2.2.1.jar
jsoup-1.10.2.jar
jtidy-r*.jar
junit-4.12.jar
-logkit-2.0.jar
+log4j-1.2-api-2.7.jar
+log4j-api-2.7.jar
+log4j-core-2.7.jar
+log4j-slf4j-impl-2.7.jar
mail-1.5.0-b01.jar
mongo-java-driver-2.11.3.jar
ph-css-5.0.3.jar
@@ -53,6 +54,7 @@ oro-2.0.8.jar
rhino-1.7.7.1.jar
serializer-2.7.2.jar
slf4j-api-1.7.22.jar
+slf4j-ext-1.7.22.jar
tika-core-1.14.jar
tika-parsers-1.14.jar
xalan-2.7.2.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1781763&r1=1781762&r2=1781763&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sun Feb 5 13:55:33 2017
@@ -21,12 +21,6 @@ accessors-smart-1.1 (net.minidev)
----------------------
- JSON Path extractor
-avalon-framework-4.1.4 (org.apache.avalon.framework)
-----------------------
-- LogKit (LoggingManager)
-- Configuration (DataSourceElement)
-- OldSaveService
-
bsf-2.4.0.jar (org.apache.bsf)
-------------
http://jakarta.apache.org/site/downloads/downloads_bsf.cgi
@@ -74,11 +68,6 @@ commons-lang3-3.5
http://commons.apache.org/downloads/download_lang.cgi
- URLCollection (unescapeXml)
-commons-logging-1.2
----------------------
-http://commons.apache.org/downloads/download_logging.cgi
-- httpclient
-
commons-math3-3.6.1
-----------------
http://commons.apache.org/proper/commons-math/download_math.cgi
@@ -99,10 +88,6 @@ dnsjava-2.1.8
http://www.dnsjava.org/download/
- DNSCacheManager
-excalibur-logger-1.1 (org.apache.avalon.excalibur.logger)
---------------------
-- LoggingManager
-
groovy-all-2.4.8
----------------------
Advised scripting language for JSR223 Test Elements
@@ -201,11 +186,6 @@ http://hc.apache.org/
- httpclient 4 implementation for HTTP sampler
- httpasyncclient implementation for InfluxDB Backend Listener Client
-logkit-2.0
-----------
-- logging
-- Anakia
-
mongo-java-driver 2.11.3
------------------------
http://www.mongodb.org/
Modified: jmeter/trunk/licenses/bin/README.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/README.txt?rev=1781763&r1=1781762&r2=1781763&view=diff
==============================================================================
--- jmeter/trunk/licenses/bin/README.txt (original)
+++ jmeter/trunk/licenses/bin/README.txt Sun Feb 5 13:55:33 2017
@@ -13,7 +13,6 @@ commons-io-2.5.jar
commons-jexl-2.1.1.jar
commons-jexl3-3.0.jar
commons-lang3-3.5.jar
-commons-logging-1.2.jar
commons-math3-3.5.jar
commons-net-3.5.jar
commons-pool2-2.4.2.jar
Added: jmeter/trunk/licenses/bin/jcl-over-slf4j-1.7.22.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/jcl-over-slf4j-1.7.22.txt?rev=1781763&view=auto
==============================================================================
--- jmeter/trunk/licenses/bin/jcl-over-slf4j-1.7.22.txt (added)
+++ jmeter/trunk/licenses/bin/jcl-over-slf4j-1.7.22.txt Sun Feb 5 13:55:33 2017
@@ -0,0 +1,24 @@
+http://www.slf4j.org/license.html
+
+SLF4J source code and binaries are distributed under the MIT license.
+Copyright (c) 2004-2013 QOS.ch
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
Propchange: jmeter/trunk/licenses/bin/jcl-over-slf4j-1.7.22.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: jmeter/trunk/licenses/bin/slf4j-ext-1.7.22.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/slf4j-ext-1.7.22.txt?rev=1781763&view=auto
==============================================================================
--- jmeter/trunk/licenses/bin/slf4j-ext-1.7.22.txt (added)
+++ jmeter/trunk/licenses/bin/slf4j-ext-1.7.22.txt Sun Feb 5 13:55:33 2017
@@ -0,0 +1,24 @@
+http://www.slf4j.org/license.html
+
+SLF4J source code and binaries are distributed under the MIT license.
+Copyright (c) 2004-2013 QOS.ch
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
Propchange: jmeter/trunk/licenses/bin/slf4j-ext-1.7.22.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL:
http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1781763&r1=1781762&r2=1781763&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Feb 5 13:55:33 2017
@@ -55,7 +55,6 @@ under the License.
<accessors-smart.version>1.1</accessors-smart.version>
<apache-bsf.version>2.4.0</apache-bsf.version>
<asm.version>5.2</asm.version>
- <avalon-framework.version>4.1.4</avalon-framework.version>
<beanshell.version>2.0b5</beanshell.version>
<bcmail.version>1.49</bcmail.version>
<bcprov.version>1.49</bcprov.version>
@@ -69,12 +68,10 @@ under the License.
<commons-jexl2.version>2.1.1</commons-jexl2.version>
<commons-jexl3.version>3.0</commons-jexl3.version>
<commons-lang3.version>3.5</commons-lang3.version>
- <commons-logging.version>1.2</commons-logging.version>
<commons-math3.version>3.6.1</commons-math3.version>
<commons-net.version>3.5</commons-net.version>
<commons-pool2.version>2.4.2</commons-pool2.version>
<dnsjava.version>2.1.8</dnsjava.version>
- <excalibur-logger.version>1.1</excalibur-logger.version>
<freemarker.version>2.3.23</freemarker.version>
<groovy-all.version>2.4.8</groovy-all.version>
<hamcrest-core.version>1.3</hamcrest-core.version>
@@ -85,6 +82,7 @@ under the License.
<httpmime.version>4.5.3</httpmime.version>
<jakarta-oro.version>2.0.8</jakarta-oro.version>
<jcharts.version>0.7.5</jcharts.version>
+ <jcl-over-slf4j.version>1.7.22</jcl-over-slf4j.version>
<jodd-core.version>3.8.1</jodd-core.version>
<jodd-lagarto.version>3.8.1</jodd-lagarto.version>
<jodd-log.version>3.8.1</jodd-log.version>
@@ -94,12 +92,16 @@ under the License.
<jsoup.version>1.10.2</jsoup.version>
<rhino.version>1.7.7.1</rhino.version>
<junit.version>4.12</junit.version>
- <logkit.version>2.0</logkit.version>
<mongo-java-driver.version>2.11.3</mongo-java-driver.version>
<ph-css.version>5.0.3</ph-css.version>
<ph-commons.version>8.6.0</ph-commons.version>
<rsyntaxtextarea.version>2.6.0</rsyntaxtextarea.version>
<slf4j-api.version>1.7.22</slf4j-api.version>
+ <slf4j-ext.version>1.7.22</slf4j-ext.version>
+ <log4j-api.version>2.7</log4j-api.version>
+ <log4j-core.version>2.7</log4j-core.version>
+ <log4j-slf4j-impl.version>2.7</log4j-slf4j-impl.version>
+ <log4j-1.2-api.version>2.7</log4j-1.2-api.version>
<jtidy.version>r938</jtidy.version>
<tika-core.version>1.14</tika-core.version>
<tika-parsers.version>1.14</tika-parsers.version>
@@ -132,11 +134,6 @@ under the License.
<version>${apache-bsf.version}</version>
</dependency>
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- <version>${avalon-framework.version}</version>
- </dependency>
- <dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh</artifactId>
<version>${beanshell.version}</version>
@@ -202,11 +199,6 @@ under the License.
<version>${commons-lang3.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>${commons-math3.version}</version>
@@ -227,11 +219,6 @@ under the License.
<version>${dnsjava.version}</version>
</dependency>
<dependency>
- <groupId>excalibur-logger</groupId>
- <artifactId>excalibur-logger</artifactId>
- <version>${excalibur-logger.version}</version>
- </dependency>
- <dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy-all.version}</version>
@@ -282,11 +269,6 @@ under the License.
<version>${junit.version}</version>
</dependency>
<dependency>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- <version>${logkit.version}</version>
- </dependency>
- <dependency>
<groupId>net.sf.jtidy</groupId>
<artifactId>jtidy</artifactId>
<version>${jtidy.version}</version>
@@ -412,6 +394,36 @@ under the License.
<version>${slf4j-api.version}</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-ext</artifactId>
+ <version>${slf4j-ext.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${jcl-over-slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j-slf4j-impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ <version>${log4j-1.2-api.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>${freemarker.version}</version>
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1781763&r1=1781762&r2=1781763&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Feb 5 13:55:33 2017
@@ -82,6 +82,19 @@ JMeter now requires Java 8. Ensure you u
<ul>
<li>JMeter requires now at least a JAVA 8 version to run.</li>
+ <li>JMeter logging has been migrated to SLF4J and Log4j2, this involves
changes in the way configuration is done. JMeter now relies on standard
+ <a
href="https://logging.apache.org/log4j/2.x/manual/configuration.html";>log4j2
configuration</a> in file <code>log4j2.xml</code>
+ </li>
+ <li>The following jars have been removed after migration from Logkit to
SLF4J (see <bugzilla>60589</bugzilla>):
+ <ul>
+ <li>ApacheJMeter_slf4j_logkit.jar</li>
+ <li>avalon-framework-4.1.4.jar</li>
+ <li>avalon-framework-4.1.4.jar</li>
+ <li>commons-logging-1.2.jar</li>
+ <li>excalibur-logger-1.1.jar</li>
+ <li>logkit-2.0.jar</li>
+ </ul>
+ </li>
<li>JMeter now sets through
<code>-Djava.security.egd=file:/dev/urandom</code> the algorithm for secure
random</li>
<li>Process Sampler now returns error code 500 when an error occurs. It
previously returned an empty value.</li>
<li>In
<code>org.apache.jmeter.protocol.http.sampler.HTTPHCAbstractImpl</code> 2
protected static fields (localhost and nonProxyHostSuffixSize) have been
renamed to (LOCALHOST and NON_PROXY_HOST_SUFFIX_SIZE)
@@ -176,6 +189,7 @@ JMeter now requires Java 8. Ensure you u
<li><bug>60654</bug>Validation Feature : Be able to ignore
BackendListener. Contributed by Maxime Chassagneux (maxime.chassagneux at
gmail.com).</li>
<li><bug>60646</bug>Workbench : Save it by default</li>
<li><bug>60684</bug>Thread Group: Validate ended prematurely by Scheduler
with 0 or very short duration. Contributed by Andrew Burton (andrewburtonatwh
at gmail.com).</li>
+ <li><bug>60589</bug>Migrate LogKit to SLF4J - Drop avalon, logkit and
excalibur with backward compatibility for 3rd party modules. Contributed by
Woonsan Ko (woonsan at apache.org)</li>
</ul>
<ch_section>Non-functional changes</ch_section>
@@ -272,6 +286,7 @@ JMeter now requires Java 8. Ensure you u
<li>Graham Russell (graham at ham1.co.uk)</li>
<li>Sanduni Kanishka (https://github.com/SanduniKanishka)</li>
<li>Andrew Burton (andrewburtonatwh at gmail.com)</li>
+<li>Woonsan Ko (woonsan at apache.org)</li>
</ul>
<p>We also thank bug reporters who helped us improve JMeter. <br/>
For this release we want to give special thanks to the following reporters for
the clear reports and tests made after our fixes:</p>
