svn commit: r1780686 - in /jmeter/trunk: build.properties res/maven/ApacheJMeter_parent.pom test/src/org/apache/jmeter/JMeterVersionTest.java

[pm...@apache.org]

Author: pmouawad
Date: Sat Jan 28 13:36:33 2017
New Revision: 1780686

URL: http://svn.apache.org/viewvc?rev=1780686&view=rev
Log:
Fix test failure after adding httpmime in LICENSE file.
No special case management anymore for httpmime

Modified:
    jmeter/trunk/build.properties
    jmeter/trunk/res/maven/ApacheJMeter_parent.pom
    jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java

Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1780686&r1=1780685&r2=1780686&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sat Jan 28 13:36:33 2017
@@ -195,8 +195,9 @@ httpclient.loc              = ${maven2.r
 httpclient.md5              = 1965ebb7aca0f9f8faaed3870d8cf689
 
 # Required for HttpClient
-httpmime.jar                = httpmime-${httpclient.version}.jar
-httpmime.loc                = ${maven2.repo}/org/apache/httpcomponents/httpmime/${httpclient.version}
+httpmime.version            = 4.5.3
+httpmime.jar                = httpmime-${httpmime.version}.jar
+httpmime.loc                = ${maven2.repo}/org/apache/httpcomponents/httpmime/${httpmime.version}
 httpmime.md5                = a00b6287cab2ad554ae3cbdbe983dc88
 
 # Required for HttpClient

Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1780686&r1=1780685&r2=1780686&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sat Jan 28 13:36:33 2017
@@ -82,6 +82,7 @@ under the License.
       <httpclient.version>4.5.3</httpclient.version>
       <httpcore.version>4.4.6</httpcore.version>
       <httpcore-nio.version>4.4.6</httpcore-nio.version>
+      <httpmime.version>4.5.3</httpmime.version>
       <jakarta-oro.version>2.0.8</jakarta-oro.version>
       <jcharts.version>0.7.5</jcharts.version>
       <jodd-core.version>3.8.1</jodd-core.version>
@@ -248,7 +249,7 @@ under the License.
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpmime</artifactId>
-        <version>${httpclient.version}</version>
+        <version>${httpmime.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>

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=1780686&r1=1780685&r2=1780686&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java Sat Jan 28 13:36:33 2017
@@ -54,7 +54,6 @@ public class JMeterVersionTest extends J
         JAR_TO_BUILD_PROP.put("bsf", "apache-bsf");
         JAR_TO_BUILD_PROP.put("bsh", "beanshell");
         JAR_TO_BUILD_PROP.put("geronimo-jms_1.1_spec", "jms");
-        JAR_TO_BUILD_PROP.put("httpmime", "httpclient"); // two jars same version
         JAR_TO_BUILD_PROP.put("mail", "javamail");
         JAR_TO_BUILD_PROP.put("oro", "jakarta-oro");
         JAR_TO_BUILD_PROP.put("xercesImpl", "xerces");