jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1532593 - in /jmeter/trunk: build.properties build.xml
Date Tue, 15 Oct 2013 23:36:43 GMT
Author: sebb
Date: Tue Oct 15 23:36:43 2013
New Revision: 1532593

URL: http://svn.apache.org/r1532593
Log:
Test version fails unless version agrees with file name

Modified:
    jmeter/trunk/build.properties
    jmeter/trunk/build.xml

Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1532593&r1=1532592&r2=1532593&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Tue Oct 15 23:36:43 2013
@@ -232,9 +232,10 @@ slf4j-api.loc               = ${maven2.r
 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
+slf4j-nop.version           = 1.7.5
+slf4j-nop.jar               = slf4j-nop-${slf4j-nop.version}.jar
+slf4j-nop.loc               = ${maven2.repo}/org/slf4j/slf4j-nop/${slf4j-nop.version}
+slf4j-nop.md5               = 8f40e93b99620d0bdd628c23e55de8a4
 
 soap.version                = 2.3.1
 soap.jar                    = soap-${soap.version}.jar

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1532593&r1=1532592&r2=1532593&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Tue Oct 15 23:36:43 2013
@@ -390,7 +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}/${slf4j-nop.jar}"/>
     <include name="${lib.dir}/${soap.jar}"/>
     <include name="${lib.dir}/${jtidy.jar}"/>
     <include name="${lib.dir}/${tika-core.jar}"/>
@@ -459,7 +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}/${slf4j-nop.jar}"/>
     <pathelement location="${lib.dir}/${soap.jar}"/>
     <pathelement location="${lib.dir}/${jtidy.jar}"/>
     <pathelement location="${lib.dir}/${tika-core.jar}"/>
@@ -2905,7 +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="slf4j-nop"/>
         <process_jarfile jarname="soap"/>
         <process_jarfile jarname="jtidy"/>
         <process_jarfile jarname="tika-core"/>



Mime
View raw message