Author: sebb
Date: Tue Oct 15 16:03:59 2013
New Revision: 1532406
URL: http://svn.apache.org/r1532406
Log:
Add SLF4J NOP implementation
TODO: Consider whether need to use proper implementation
Modified:
jmeter/trunk/build.properties
jmeter/trunk/build.xml
jmeter/trunk/res/maven/ApacheJMeter_parent.pom
Modified: jmeter/trunk/build.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1532406&r1=1532405&r2=1532406&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Tue Oct 15 16:03:59 2013
@@ -231,6 +231,11 @@ slf4j-api.jar = slf4j-api-
slf4j-api.loc =
${maven2.repo}/org/slf4j/slf4j-api/${slf4j-api.version}
slf4j-api.md5 = 3b1ececad9ebc3fbad2953ccf4a070ca
+# Implementation to be used (currently NOP)
+slf4j-impl.jar = slf4j-nop-${slf4j-api.version}.jar
+slf4j-impl.loc =
${maven2.repo}/org/slf4j/slf4j-nop/${slf4j-api.version}
+slf4j-impl.md5 = 8f40e93b99620d0bdd628c23e55de8a4
+
soap.version = 2.3.1
soap.jar = soap-${soap.version}.jar
soap.loc = ${maven2.repo}/soap/soap/${soap.version}
Modified: jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1532406&r1=1532405&r2=1532406&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Tue Oct 15 16:03:59 2013
@@ -390,6 +390,7 @@
<include name="${lib.dir}/${rsyntaxtextarea.jar}"/>
<include name="${lib.dir}/${serializer.jar}"/>
<include name="${lib.dir}/${slf4j-api.jar}"/>
+ <include name="${lib.dir}/${slf4j-impl.jar}"/>
<include name="${lib.dir}/${soap.jar}"/>
<include name="${lib.dir}/${jtidy.jar}"/>
<include name="${lib.dir}/${tika-core.jar}"/>
@@ -458,6 +459,7 @@
<pathelement location="${lib.dir}/${rsyntaxtextarea.jar}"/>
<pathelement location="${lib.dir}/${serializer.jar}"/>
<pathelement location="${lib.dir}/${slf4j-api.jar}"/>
+ <pathelement location="${lib.dir}/${slf4j-impl.jar}"/>
<pathelement location="${lib.dir}/${soap.jar}"/>
<pathelement location="${lib.dir}/${jtidy.jar}"/>
<pathelement location="${lib.dir}/${tika-core.jar}"/>
@@ -2903,6 +2905,7 @@ run JMeter unless all the JMeter jars ar
<process_jarfile jarname="mongo-java-driver"/>
<process_jarfile jarname="serializer"/>
<process_jarfile jarname="slf4j-api"/>
+ <process_jarfile jarname="slf4j-impl"/>
<process_jarfile jarname="soap"/>
<process_jarfile jarname="jtidy"/>
<process_jarfile jarname="tika-core"/>
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL:
http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1532406&r1=1532405&r2=1532406&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Tue Oct 15 16:03:59 2013
@@ -361,6 +361,11 @@ under the License.
<artifactId>slf4j-api</artifactId>
<version>${slf4j-api.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-nop</artifactId>
+ <version>${slf4j-api.version}</version>
+ </dependency>
<!-- Docs only; not needed for source or binary archives
<dependency>
<groupId>org.apache.velocity</groupId>
