You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/03/26 15:58:47 UTC

svn commit: r1788738 - in /jmeter/trunk: LICENSE build.properties eclipse.classpath lib/ lib/aareadme.txt res/maven/ApacheJMeter_parent.pom xdocs/changes.xml

Author: pmouawad
Date: Sun Mar 26 15:58:46 2017
New Revision: 1788738

URL: http://svn.apache.org/viewvc?rev=1788738&view=rev
Log:
Upgrade to json-smart-2.3

Modified:
    jmeter/trunk/LICENSE
    jmeter/trunk/build.properties
    jmeter/trunk/eclipse.classpath
    jmeter/trunk/lib/   (props changed)
    jmeter/trunk/lib/aareadme.txt
    jmeter/trunk/res/maven/ApacheJMeter_parent.pom
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/LICENSE
URL: http://svn.apache.org/viewvc/jmeter/trunk/LICENSE?rev=1788738&r1=1788737&r2=1788738&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Sun Mar 26 15:58:46 2017
@@ -247,7 +247,7 @@ The following software is provided under
 * caffeine-2.4.0.jar
 * freemarker-2.3.23.jar (AL2.0, see licenses/bin for additional info)
 * json-path-2.2.0.jar
-* json-smart-2.2.1.jar
+* json-smart-2.3.jar
 * mongo-java-driver-2.11.3.jar
 * ph-commons-8.6.0.jar
 * ph-css-5.0.3.jar

Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1788738&r1=1788737&r2=1788738&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Mar 26 15:58:46 2017
@@ -230,10 +230,10 @@ json-path.jar               = json-path-
 json-path.loc               = ${maven2.repo}/com/jayway/jsonpath/json-path/${json-path.version}
 json-path.md5               = 98ec1b51b19c21a32845ba3498df6629
 
-json-smart.version          = 2.2.1
+json-smart.version          = 2.3
 json-smart.jar              = json-smart-${json-smart.version}.jar
 json-smart.loc              = ${maven2.repo}/net/minidev/json-smart/${json-smart.version}
-json-smart.md5              = 4c82c537eb0ba92adad494283711cc11
+json-smart.md5              = f2a921d4baaa7308de04eed4d8d72715
 
 jsoup.version               = 1.10.2
 jsoup.jar                   = jsoup-${jsoup.version}.jar

Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1788738&r1=1788737&r2=1788738&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun Mar 26 15:58:46 2017
@@ -77,7 +77,7 @@
 	<classpathentry kind="lib" path="lib/jodd-log-3.8.1.jar"/>
 	<classpathentry kind="lib" path="lib/jodd-props-3.8.1.jar"/>
 	<classpathentry kind="lib" path="lib/json-path-2.2.0.jar"/>
-	<classpathentry kind="lib" path="lib/json-smart-2.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/json-smart-2.3.jar"/>
 	<classpathentry kind="lib" path="lib/jsoup-1.10.2.jar"/>
 	<classpathentry kind="lib" path="lib/jtidy-r938.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.12.jar"/>

Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Mar 26 15:58:46 2017
@@ -37,7 +37,7 @@ jodd-log-3.8.1.jar
 jodd-props-3.8.1.jar
 jorphan.jar
 json-path-2.2.0.jar
-json-smart-2.2.1.jar
+json-smart-2.3.jar
 jsoup-1.10.2.jar
 jtidy-r*.jar
 junit-4.12.jar

Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1788738&r1=1788737&r2=1788738&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sun Mar 26 15:58:46 2017
@@ -136,7 +136,7 @@ https://github.com/jayway/JsonPath
 - JSON Path Extractor
 - JSON Path Renderer
 
-json-smart-2.2.1 (net.minidev)
+json-smart-2.3 (net.minidev)
 --------
 https://github.com/netplex/json-smart-v2
 - JSON Path Extractor

Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1788738&r1=1788737&r2=1788738&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Mar 26 15:58:46 2017
@@ -87,7 +87,7 @@ under the License.
       <jodd-log.version>3.8.1</jodd-log.version>
       <jodd-props.version>3.8.1</jodd-props.version>
       <json-path.version>2.2.0</json-path.version>
-      <json-smart.version>2.2.1</json-smart.version>
+      <json-smart.version>2.3</json-smart.version>
       <jsoup.version>1.10.2</jsoup.version>
       <rhino.version>1.7.7.1</rhino.version>
       <junit.version>4.12</junit.version>

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1788738&r1=1788737&r2=1788738&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Mar 26 15:58:46 2017
@@ -332,6 +332,7 @@ listeners hold and a rework of the way G
     <li>Updated to asm 5.2 (from 5.1)</li>
     <li>Updated to rsyntaxtextarea-2.6.1 (from 2.6.0)</li>
     <li>Updated to commons-net-3.6 (from 3.5)</li>
+    <li>Updated to json-smart-2.3 (from 2.2.1)</li>
     <li>Converted the old pdf tutorials to xml.</li>
     <li><pr>255</pr> - Utilised Java 8 (and 7) features to tidy up code. Contributed by Graham Russell (graham at ham1.co.uk)</li>
     <li><bug>59435</bug>JMeterTestCase no longer supports JUnit3</li>