You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2018/07/15 13:40:28 UTC
svn commit: r1835975 - in /jmeter/trunk: ./ lib/ licenses/bin/ res/maven/
test/src/org/apache/jmeter/extractor/ xdocs/
Author: fschumacher
Date: Sun Jul 15 13:40:28 2018
New Revision: 1835975
URL: http://svn.apache.org/viewvc?rev=1835975&view=rev
Log:
Updated jodd from 4.1.4 to 5.0.3
Updated to jodd-core-5.0.3 (from jodd-core-4.1.4)
Updated to jodd-lagarto-5.0.3 (from jodd-lagarto-4.1.4)
Updated to jodd-log-5.0.3 (from jodd-log-4.1.4)
Updated to jodd-props-5.0.3 (from jodd-props-4.1.4)
Added a test spec for JoddExtractor
Added:
jmeter/trunk/licenses/bin/jodd-core-5.0.3.txt
- copied, changed from r1835974, jmeter/trunk/licenses/bin/jodd-core-4.1.4.txt
jmeter/trunk/licenses/bin/jodd-lagarto-5.0.3.txt
- copied unchanged from r1835974, jmeter/trunk/licenses/bin/jodd-lagarto-4.1.4.txt
jmeter/trunk/licenses/bin/jodd-log-5.0.3.txt
- copied unchanged from r1835974, jmeter/trunk/licenses/bin/jodd-log-4.1.4.txt
jmeter/trunk/licenses/bin/jodd-props-5.0.3.txt
- copied unchanged from r1835974, jmeter/trunk/licenses/bin/jodd-props-4.1.4.txt
jmeter/trunk/test/src/org/apache/jmeter/extractor/JoddExtractorSpec.groovy (with props)
Removed:
jmeter/trunk/licenses/bin/jodd-core-4.1.4.txt
jmeter/trunk/licenses/bin/jodd-lagarto-4.1.4.txt
jmeter/trunk/licenses/bin/jodd-log-4.1.4.txt
jmeter/trunk/licenses/bin/jodd-props-4.1.4.txt
Modified:
jmeter/trunk/LICENSE
jmeter/trunk/build.properties
jmeter/trunk/eclipse.classpath
jmeter/trunk/lib/ (props changed)
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=1835975&r1=1835974&r2=1835975&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Sun Jul 15 13:40:28 2018
@@ -270,10 +270,10 @@ For details, please see the files under:
* jcharts-0.7.5.jar (?)
* jcl-over-slf4j-1.7.25.jar (MIT)
* jsoup-1.11.2.jar (MIT)
-* jodd-core-4.1.4.jar (Simplified BSD)
-* jodd-lagarto-4.1.4.jar (Simplified BSD)
-* jodd-log-4.1.4.jar (Simplified BSD)
-* jodd-props-4.1.4.jar (Simplified BSD)
+* jodd-core-5.0.3.jar (Simplified BSD)
+* jodd-lagarto-5.0.3.jar (Simplified BSD)
+* jodd-log-5.0.3.jar (Simplified BSD)
+* jodd-props-5.0.3.jar (Simplified BSD)
* jtidy-r938.jar (?)
* junit-4.12.jar (BSD)
* rhino-1.7.7.2.jar (MPL 2.0)
Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1835975&r1=1835974&r2=1835975&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Jul 15 13:40:28 2018
@@ -230,25 +230,25 @@ javax.activation.jar = jav
javax.activation.loc = ${maven2.repo}/com/sun/activation/javax.activation/${javax.activation.version}
javax.activation.md5 = be7c430df50b330cffc4848a3abedbfb
-jodd-core.version = 4.1.4
+jodd-core.version = 5.0.3
jodd-core.jar = jodd-core-${jodd-core.version}.jar
jodd-core.loc = ${maven2.repo}/org/jodd/jodd-core/${jodd-core.version}
-jodd-core.md5 = 1ab42839ca15f9df2e569f48cc1ce8bf
+jodd-core.md5 = 9f7f0fd694298ae59e361f8c217e1d67
-jodd-lagarto.version = 4.1.4
+jodd-lagarto.version = 5.0.3
jodd-lagarto.jar = jodd-lagarto-${jodd-lagarto.version}.jar
jodd-lagarto.loc = ${maven2.repo}/org/jodd/jodd-lagarto/${jodd-lagarto.version}
-jodd-lagarto.md5 = 93a2318f25da86e997f56e687a61f38d
+jodd-lagarto.md5 = 5458983ede6ac5754cb2edc6fdd7a91d
-jodd-log.version = 4.1.4
+jodd-log.version = 5.0.3
jodd-log.jar = jodd-log-${jodd-log.version}.jar
jodd-log.loc = ${maven2.repo}/org/jodd/jodd-log/${jodd-log.version}
-jodd-log.md5 = 436605704ffa02f9aabbcd3a779e8995
+jodd-log.md5 = 5130861f04bad52cc87cd0b45007ce77
-jodd-props.version = 4.1.4
+jodd-props.version = 5.0.3
jodd-props.jar = jodd-props-${jodd-props.version}.jar
jodd-props.loc = ${maven2.repo}/org/jodd/jodd-props/${jodd-props.version}
-jodd-props.md5 = e7a5017de253a20ce924ff4ce245d33d
+jodd-props.md5 = d3f1550d4ccf7546b6eeb680f76234a8
json-path.version = 2.4.0
json-path.jar = json-path-${json-path.version}.jar
Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1835975&r1=1835974&r2=1835975&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun Jul 15 13:40:28 2018
@@ -77,10 +77,10 @@
<classpathentry kind="lib" path="lib/javax.activation-1.2.0.jar"/>
<classpathentry kind="lib" path="lib/jcharts-0.7.5.jar"/>
<classpathentry kind="lib" path="lib/jcl-over-slf4j-1.7.25.jar"/>
- <classpathentry kind="lib" path="lib/jodd-core-4.1.4.jar"/>
- <classpathentry kind="lib" path="lib/jodd-lagarto-4.1.4.jar"/>
- <classpathentry kind="lib" path="lib/jodd-log-4.1.4.jar"/>
- <classpathentry kind="lib" path="lib/jodd-props-4.1.4.jar"/>
+ <classpathentry kind="lib" path="lib/jodd-core-5.0.3.jar"/>
+ <classpathentry kind="lib" path="lib/jodd-lagarto-5.0.3.jar"/>
+ <classpathentry kind="lib" path="lib/jodd-log-5.0.3.jar"/>
+ <classpathentry kind="lib" path="lib/jodd-props-5.0.3.jar"/>
<classpathentry kind="lib" path="lib/json-path-2.4.0.jar"/>
<classpathentry kind="lib" path="lib/json-smart-2.3.jar"/>
<classpathentry kind="lib" path="lib/jsoup-1.11.2.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jul 15 13:40:28 2018
@@ -38,10 +38,10 @@ javax.activation-1.2.0.jar
jcharts-0.7.5.jar
jcl-over-slf4j-1.7.25.jar
jms*.jar
-jodd-core-4.1.4.jar
-jodd-lagarto-4.1.4.jar
-jodd-log-4.1.4.jar
-jodd-props-4.1.4.jar
+jodd-core-5.0.3.jar
+jodd-lagarto-5.0.3.jar
+jodd-log-5.0.3.jar
+jodd-props-5.0.3.jar
jorphan.jar
json-path-2.4.0.jar
json-smart-2.3.jar
Copied: jmeter/trunk/licenses/bin/jodd-core-5.0.3.txt (from r1835974, jmeter/trunk/licenses/bin/jodd-core-4.1.4.txt)
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/jodd-core-5.0.3.txt?p2=jmeter/trunk/licenses/bin/jodd-core-5.0.3.txt&p1=jmeter/trunk/licenses/bin/jodd-core-4.1.4.txt&r1=1835974&r2=1835975&rev=1835975&view=diff
==============================================================================
--- jmeter/trunk/licenses/bin/jodd-core-4.1.4.txt (original)
+++ jmeter/trunk/licenses/bin/jodd-core-5.0.3.txt Sun Jul 15 13:40:28 2018
@@ -1,24 +1,27 @@
Jodd software is released under Simplified BSD License.
-Copyright (c) 2003-2015, Jodd Team All rights reserved.
+Copyright (c) 2003-2018, Jodd Team (https://jodd.org)
+All rights reserved.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
-Redistributions of source code must retain the above copyright notice, this list
-of conditions and the following disclaimer.
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
-Redistributions in binary form must reproduce the above copyright notice, this
-list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1835975&r1=1835974&r2=1835975&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Jul 15 13:40:28 2018
@@ -86,10 +86,10 @@ under the License.
<javax.activation.version>1.2.0</javax.activation.version>
<jcharts.version>0.7.5</jcharts.version>
<jcl-over-slf4j.version>1.7.25</jcl-over-slf4j.version>
- <jodd-core.version>4.1.4</jodd-core.version>
- <jodd-lagarto.version>4.1.4</jodd-lagarto.version>
- <jodd-log.version>4.1.4</jodd-log.version>
- <jodd-props.version>4.1.4</jodd-props.version>
+ <jodd-core.version>5.0.3</jodd-core.version>
+ <jodd-lagarto.version>5.0.3</jodd-lagarto.version>
+ <jodd-log.version>5.0.3</jodd-log.version>
+ <jodd-props.version>5.0.3</jodd-props.version>
<json-path.version>2.4.0</json-path.version>
<json-smart.version>2.3</json-smart.version>
<jsoup.version>1.11.2</jsoup.version>
Added: jmeter/trunk/test/src/org/apache/jmeter/extractor/JoddExtractorSpec.groovy
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/extractor/JoddExtractorSpec.groovy?rev=1835975&view=auto
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/extractor/JoddExtractorSpec.groovy (added)
+++ jmeter/trunk/test/src/org/apache/jmeter/extractor/JoddExtractorSpec.groovy Sun Jul 15 13:40:28 2018
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.extractor;
+
+import java.awt.event.ActionEvent
+
+import org.apache.jmeter.junit.spock.JMeterSpec
+
+import spock.lang.IgnoreIf
+import spock.lang.Unroll
+
+@Unroll
+class JoddExtractorSpec extends JMeterSpec {
+
+ def "extract #expression and #attribute"() {
+ when:
+ def extractor = new JoddExtractor()
+ def resultList = []
+ def input = """
+<html>
+ <head><title>Test</title></head>
+ <body>
+ <h1 class="title">TestTitle</h1>
+ <p>Some text</p>
+ <h1>AnotherTitle</h1>
+ </body>
+</html>
+"""
+ then:
+ expected == extractor.extract(expression, attribute, matchNumber, input, resultList, found, cacheKey)
+ expectedList == resultList
+ where:
+ expression | attribute | matchNumber | expectedList | found | expected | cacheKey
+ "p" | "" | 1 | ["Some text"] | -1 | 0 | "key"
+ "h1[class=title]" | "class" | 1 | ["title"] | -1 | 0 | "key"
+ "h1" | "" | 0 | ["TestTitle", "AnotherTitle"] | -1 | 1 | "key"
+ "notthere" | "" | 0 | [] | -1 | -1 | "key"
+ }
+}
Propchange: jmeter/trunk/test/src/org/apache/jmeter/extractor/JoddExtractorSpec.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1835975&r1=1835974&r2=1835975&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Jul 15 13:40:28 2018
@@ -176,6 +176,10 @@ this behaviour, set <code>httpclient.res
<li>Updated to commons-pool2-2.6.0 (from commons-pool2-2.5.0)</li>
<li>Updated to httpcore-4.4.10 (from httpcore-4.4.9)</li>
<li>Updated to httpcore-nio-4.4.10 (from httpcore-nio-4.4.9)</li>
+ <li>Updated to jodd-core-5.0.3 (from jodd-core-4.1.4)</li>
+ <li>Updated to jodd-lagarto-5.0.3 (from jodd-lagarto-4.1.4)</li>
+ <li>Updated to jodd-log-5.0.3 (from jodd-log-4.1.4)</li>
+ <li>Updated to jodd-props-5.0.3 (from jodd-props-4.1.4)</li>
</ul>
<!-- =================== Bug fixes =================== -->