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/08/18 09:57:12 UTC
svn commit: r1838321 - in /jmeter/trunk: ./ lib/ licenses/bin/ res/maven/
xdocs/
Author: fschumacher
Date: Sat Aug 18 09:57:12 2018
New Revision: 1838321
URL: http://svn.apache.org/viewvc?rev=1838321&view=rev
Log:
Partial revert of r1835975 (bring back jodd 4.1.4)
The newer version of jodd breaks tests when run on java 11.
Added:
jmeter/trunk/licenses/bin/jodd-core-4.1.4.txt
- copied unchanged from r1835974, jmeter/trunk/licenses/bin/jodd-core-4.1.4.txt
jmeter/trunk/licenses/bin/jodd-lagarto-4.1.4.txt
- copied unchanged from r1835974, jmeter/trunk/licenses/bin/jodd-lagarto-4.1.4.txt
jmeter/trunk/licenses/bin/jodd-log-4.1.4.txt
- copied unchanged from r1835974, jmeter/trunk/licenses/bin/jodd-log-4.1.4.txt
jmeter/trunk/licenses/bin/jodd-props-4.1.4.txt
- copied unchanged from r1835974, jmeter/trunk/licenses/bin/jodd-props-4.1.4.txt
Removed:
jmeter/trunk/licenses/bin/jodd-core-5.0.3.txt
jmeter/trunk/licenses/bin/jodd-lagarto-5.0.3.txt
jmeter/trunk/licenses/bin/jodd-log-5.0.3.txt
jmeter/trunk/licenses/bin/jodd-props-5.0.3.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=1838321&r1=1838320&r2=1838321&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Sat Aug 18 09:57:12 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-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)
+* 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)
* jtidy-r938.jar (?)
* junit-4.12.jar (BSD)
* rhino-1.7.10.jar (MPL 2.0)
Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1838321&r1=1838320&r2=1838321&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sat Aug 18 09:57:12 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 = 5.0.3
+jodd-core.version = 4.1.4
jodd-core.jar = jodd-core-${jodd-core.version}.jar
jodd-core.loc = ${maven2.repo}/org/jodd/jodd-core/${jodd-core.version}
-jodd-core.md5 = 9f7f0fd694298ae59e361f8c217e1d67
+jodd-core.md5 = 1ab42839ca15f9df2e569f48cc1ce8bf
-jodd-lagarto.version = 5.0.3
+jodd-lagarto.version = 4.1.4
jodd-lagarto.jar = jodd-lagarto-${jodd-lagarto.version}.jar
jodd-lagarto.loc = ${maven2.repo}/org/jodd/jodd-lagarto/${jodd-lagarto.version}
-jodd-lagarto.md5 = 5458983ede6ac5754cb2edc6fdd7a91d
+jodd-lagarto.md5 = 93a2318f25da86e997f56e687a61f38d
-jodd-log.version = 5.0.3
+jodd-log.version = 4.1.4
jodd-log.jar = jodd-log-${jodd-log.version}.jar
jodd-log.loc = ${maven2.repo}/org/jodd/jodd-log/${jodd-log.version}
-jodd-log.md5 = 5130861f04bad52cc87cd0b45007ce77
+jodd-log.md5 = 436605704ffa02f9aabbcd3a779e8995
-jodd-props.version = 5.0.3
+jodd-props.version = 4.1.4
jodd-props.jar = jodd-props-${jodd-props.version}.jar
jodd-props.loc = ${maven2.repo}/org/jodd/jodd-props/${jodd-props.version}
-jodd-props.md5 = d3f1550d4ccf7546b6eeb680f76234a8
+jodd-props.md5 = e7a5017de253a20ce924ff4ce245d33d
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=1838321&r1=1838320&r2=1838321&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sat Aug 18 09:57:12 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-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/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/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 Sat Aug 18 09:57:12 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-5.0.3.jar
-jodd-lagarto-5.0.3.jar
-jodd-log-5.0.3.jar
-jodd-props-5.0.3.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
jorphan.jar
json-path-2.4.0.jar
json-smart-2.3.jar
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1838321&r1=1838320&r2=1838321&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sat Aug 18 09:57:12 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>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>
+ <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>
<json-path.version>2.4.0</json-path.version>
<json-smart.version>2.3</json-smart.version>
<jsoup.version>1.11.2</jsoup.version>
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1838321&r1=1838320&r2=1838321&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Aug 18 09:57:12 2018
@@ -182,10 +182,6 @@ 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>
<li>Updated to log4j-2.11.0 (from log4j-2.10.0)</li>
<li>Updated to ph-css-6.1.1 (from ph-css-6.0.0)</li>
<li>Updated to ph-commons-9.1.2 (from ph-commons-9.0.0)</li>
Re: svn commit: r1838321 - in /jmeter/trunk: ./ lib/ licenses/bin/
res/maven/ xdocs/
Posted by Felix Schumacher <fe...@internetallee.de>.
It seems that we really have to do look into all the things that come
with Java 11 :(
Regards,
Felix
Am 18.08.2018 um 11:57 schrieb fschumacher@apache.org:
> Author: fschumacher
> Date: Sat Aug 18 09:57:12 2018
> New Revision: 1838321
>
> URL: http://svn.apache.org/viewvc?rev=1838321&view=rev
> Log:
> Partial revert of r1835975 (bring back jodd 4.1.4)
>
> The newer version of jodd breaks tests when run on java 11.
>
> Added:
> jmeter/trunk/licenses/bin/jodd-core-4.1.4.txt
> - copied unchanged from r1835974, jmeter/trunk/licenses/bin/jodd-core-4.1.4.txt
> jmeter/trunk/licenses/bin/jodd-lagarto-4.1.4.txt
> - copied unchanged from r1835974, jmeter/trunk/licenses/bin/jodd-lagarto-4.1.4.txt
> jmeter/trunk/licenses/bin/jodd-log-4.1.4.txt
> - copied unchanged from r1835974, jmeter/trunk/licenses/bin/jodd-log-4.1.4.txt
> jmeter/trunk/licenses/bin/jodd-props-4.1.4.txt
> - copied unchanged from r1835974, jmeter/trunk/licenses/bin/jodd-props-4.1.4.txt
> Removed:
> jmeter/trunk/licenses/bin/jodd-core-5.0.3.txt
> jmeter/trunk/licenses/bin/jodd-lagarto-5.0.3.txt
> jmeter/trunk/licenses/bin/jodd-log-5.0.3.txt
> jmeter/trunk/licenses/bin/jodd-props-5.0.3.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=1838321&r1=1838320&r2=1838321&view=diff
> ==============================================================================
> --- jmeter/trunk/LICENSE [utf-8] (original)
> +++ jmeter/trunk/LICENSE [utf-8] Sat Aug 18 09:57:12 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-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)
> +* 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)
> * jtidy-r938.jar (?)
> * junit-4.12.jar (BSD)
> * rhino-1.7.10.jar (MPL 2.0)
>
> Modified: jmeter/trunk/build.properties
> URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1838321&r1=1838320&r2=1838321&view=diff
> ==============================================================================
> --- jmeter/trunk/build.properties (original)
> +++ jmeter/trunk/build.properties Sat Aug 18 09:57:12 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 = 5.0.3
> +jodd-core.version = 4.1.4
> jodd-core.jar = jodd-core-${jodd-core.version}.jar
> jodd-core.loc = ${maven2.repo}/org/jodd/jodd-core/${jodd-core.version}
> -jodd-core.md5 = 9f7f0fd694298ae59e361f8c217e1d67
> +jodd-core.md5 = 1ab42839ca15f9df2e569f48cc1ce8bf
>
> -jodd-lagarto.version = 5.0.3
> +jodd-lagarto.version = 4.1.4
> jodd-lagarto.jar = jodd-lagarto-${jodd-lagarto.version}.jar
> jodd-lagarto.loc = ${maven2.repo}/org/jodd/jodd-lagarto/${jodd-lagarto.version}
> -jodd-lagarto.md5 = 5458983ede6ac5754cb2edc6fdd7a91d
> +jodd-lagarto.md5 = 93a2318f25da86e997f56e687a61f38d
>
> -jodd-log.version = 5.0.3
> +jodd-log.version = 4.1.4
> jodd-log.jar = jodd-log-${jodd-log.version}.jar
> jodd-log.loc = ${maven2.repo}/org/jodd/jodd-log/${jodd-log.version}
> -jodd-log.md5 = 5130861f04bad52cc87cd0b45007ce77
> +jodd-log.md5 = 436605704ffa02f9aabbcd3a779e8995
>
> -jodd-props.version = 5.0.3
> +jodd-props.version = 4.1.4
> jodd-props.jar = jodd-props-${jodd-props.version}.jar
> jodd-props.loc = ${maven2.repo}/org/jodd/jodd-props/${jodd-props.version}
> -jodd-props.md5 = d3f1550d4ccf7546b6eeb680f76234a8
> +jodd-props.md5 = e7a5017de253a20ce924ff4ce245d33d
>
> 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=1838321&r1=1838320&r2=1838321&view=diff
> ==============================================================================
> --- jmeter/trunk/eclipse.classpath (original)
> +++ jmeter/trunk/eclipse.classpath Sat Aug 18 09:57:12 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-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/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/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 Sat Aug 18 09:57:12 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-5.0.3.jar
> -jodd-lagarto-5.0.3.jar
> -jodd-log-5.0.3.jar
> -jodd-props-5.0.3.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
> jorphan.jar
> json-path-2.4.0.jar
> json-smart-2.3.jar
>
> Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
> URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1838321&r1=1838320&r2=1838321&view=diff
> ==============================================================================
> --- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
> +++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sat Aug 18 09:57:12 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>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>
> + <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>
> <json-path.version>2.4.0</json-path.version>
> <json-smart.version>2.3</json-smart.version>
> <jsoup.version>1.11.2</jsoup.version>
>
> Modified: jmeter/trunk/xdocs/changes.xml
> URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1838321&r1=1838320&r2=1838321&view=diff
> ==============================================================================
> --- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
> +++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Aug 18 09:57:12 2018
> @@ -182,10 +182,6 @@ 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>
> <li>Updated to log4j-2.11.0 (from log4j-2.10.0)</li>
> <li>Updated to ph-css-6.1.1 (from ph-css-6.0.0)</li>
> <li>Updated to ph-commons-9.1.2 (from ph-commons-9.0.0)</li>
>
>