jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1850638 - in /jmeter/trunk: res/maven/ApacheJMeter_parent.pom test/src/org/apache/jmeter/JMeterVersionTest.java
Date Mon, 07 Jan 2019 13:26:30 GMT
Author: pmouawad
Date: Mon Jan  7 13:26:29 2019
New Revision: 1850638

URL: http://svn.apache.org/viewvc?rev=1850638&view=rev
Log:
Bug 63059 - Create a new JSonExporter that exports as JSON the content of data computed for
HTML Dashboard Statistics table

Fix test failure, we need to have 1 version property per variant of jackson library
Bugzilla Id: 63059

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

Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1850638&r1=1850637&r2=1850638&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Mon Jan  7 13:26:29 2019
@@ -82,7 +82,9 @@ under the License.
       <httpcore.version>4.4.10</httpcore.version>
       <httpcore-nio.version>4.4.10</httpcore-nio.version>
       <httpmime.version>4.5.6</httpmime.version>
-      <jackson.version>2.9.8</jackson.version>
+      <jackson-annotations.version>2.9.8</jackson-annotations.version>
+      <jackson-core.version>2.9.8</jackson-core.version>
+      <jackson-databind.version>2.9.8</jackson-databind.version>
       <jakarta-oro.version>2.0.8</jakarta-oro.version>
       <javax.activation-api.version>1.2.0</javax.activation-api.version>
       <javax.activation.version>1.2.0</javax.activation.version>
@@ -270,17 +272,17 @@ under the License.
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
-        <version>${jackson.version}</version>
+        <version>${jackson-databind.version}</version>
       </dependency>
         <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-annotations</artifactId>
-        <version>${jackson.version}</version>
+        <version>${jackson-annotations.version}</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>
-        <version>${jackson.version}</version>
+        <version>${jackson-core.version}</version>
       </dependency>
       <dependency>
         <groupId>jcharts</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=1850638&r1=1850637&r2=1850638&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java Mon Jan  7 13:26:29 2019
@@ -46,6 +46,7 @@ import org.junit.Test;
 
 /**
  * Check the eclipse and Maven version definitions against build.properties
+ * Drop this if we move to Maven the build process
  */
 public class JMeterVersionTest extends JMeterTestCase {
 



Mime
View raw message