jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1620300 - /jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java
Date Mon, 25 Aug 2014 12:04:44 GMT
Author: pmouawad
Date: Mon Aug 25 12:04:44 2014
New Revision: 1620300

URL: http://svn.apache.org/r1620300
Log:
Bug 56772 - Handle IE Conditional comments when parsing embedded resources
Fix issue in eclipse.classpath check related to using Jodd 3.6.0-BETA2
Bugzilla Id: 56772

Modified:
    jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java

Modified: jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java?rev=1620300&r1=1620299&r2=1620300&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java Mon Aug 25 12:04:44 2014
@@ -125,8 +125,16 @@ public class JMeterVersionTest extends J
                 } else if (jar.endsWith("mail-1.5.0")) { // special hack for mail-1.5.0-b01,
to remove when migrating to 1.5.0
                     jar = "javamail";
                     version = "1.5.0-b01";
-                }
-                else {
+                } else if (jar.indexOf("jodd")>=0) { 
+                    version = "3.6.0-BETA2";
+                    if (jar.indexOf("jodd-core")>=0) { // special hack for jodd-core-3.6.0-BETA2
+                        jar = "jodd-core";
+                    } else if (jar.indexOf("jodd-log")>=0) { // special hack for jodd-log-3.6.0-BETA2
+                        jar = "jodd-log";
+                    } else if (jar.indexOf("jodd-lagarto")>=0) { // special hack for jodd-lagarto-3.6.0-BETA2
+                        jar = "jodd-lagarto";
+                    }
+                } else {
                     String tmp = JAR_TO_BUILD_PROP.get(jar);
                     if (tmp != null) {
                         jar = tmp;



Mime
View raw message