Author: pmouawad
Date: Fri Dec 18 12:40:38 2015
New Revision: 1720771
URL: http://svn.apache.org/viewvc?rev=1720771&view=rev
Log:
Update freemarker to 2.3.23
Added:
jmeter/trunk/licenses/bin/freemarker-2.3.23.txt (props changed)
- copied unchanged from r1718720,
jmeter/trunk/licenses/bin/freemarker-2.3.22.txt
Removed:
jmeter/trunk/licenses/bin/freemarker-2.3.22.txt
Modified:
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
Modified: jmeter/trunk/build.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1720771&r1=1720770&r2=1720771&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Fri Dec 18 12:40:38 2015
@@ -172,10 +172,10 @@ excalibur-pool-instrumented.loc = ${
excalibur-pool-instrumented.md5 = 1b5425fe0fe63dc67da6fe995db6be31
# Freemarker
-freemarker.version = 2.3.22
+freemarker.version = 2.3.23
freemarker.loc =
${maven2.repo}/org/freemarker/freemarker/${freemarker.version}
freemarker.jar = freemarker-${freemarker.version}.jar
-freemarker.md5 = 51cca65040c41326e9b6b2806aba23ff
+freemarker.md5 = cbb1cec300ca98eea3c855cf395d4951
# Common file containing both htmlparser and htmllexer jars
htmlparser.version = 2.1
Modified: jmeter/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1720771&r1=1720770&r2=1720771&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Fri Dec 18 12:40:38 2015
@@ -64,7 +64,7 @@
<classpathentry kind="lib" path="lib/excalibur-pool-api-2.1.jar"/>
<classpathentry kind="lib" path="lib/excalibur-pool-impl-2.1.jar"/>
<classpathentry kind="lib"
path="lib/excalibur-pool-instrumented-2.1.jar"/>
- <classpathentry kind="lib" path="lib/freemarker-2.3.22.jar"/>
+ <classpathentry kind="lib" path="lib/freemarker-2.3.23.jar"/>
<classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/htmllexer-2.1.jar"/>
<classpathentry kind="lib" path="lib/htmlparser-2.1.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Dec 18 12:40:38 2015
@@ -22,7 +22,7 @@ excalibur-datasource-2.1.jar
excalibur-pool-api-2.1.jar
excalibur-pool-impl-2.1.jar
excalibur-pool-instrumented-2.1.jar
-freemarker-2.3.22.jar
+freemarker-2.3.23.jar
geronimo*.jar
htmllexer-2.1.jar
htmlparser-2.1.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1720771&r1=1720770&r2=1720771&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Fri Dec 18 12:40:38 2015
@@ -107,7 +107,7 @@ excalibur-pool-1.2 (org.apache.avalon.ex
------------------
- used by excalibur-datasource
-freemarker-2.3.22.jar
+freemarker-2.3.23.jar
----------------------
- used by Report/Dashboard feature
Propchange: jmeter/trunk/licenses/bin/freemarker-2.3.23.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL:
http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1720771&r1=1720770&r2=1720771&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Fri Dec 18 12:40:38 2015
@@ -77,7 +77,7 @@ under the License.
<excalibur-pool-api.version>${excalibur-pool.version}</excalibur-pool-api.version>
<excalibur-pool-impl.version>${excalibur-pool.version}</excalibur-pool-impl.version>
<excalibur-pool-instrumented.version>${excalibur-pool.version}</excalibur-pool-instrumented.version>
- <freemarker.version>2.3.22</freemarker.version>
+ <freemarker.version>2.3.23</freemarker.version>
<htmlparser.version>2.1</htmlparser.version>
<httpclient.version>4.2.6</httpclient.version>
<httpcore.version>4.2.5</httpcore.version>
