Author: milamber
Date: Sun Feb 10 14:32:30 2019
New Revision: 1853311
URL: http://svn.apache.org/viewvc?rev=1853311&view=rev
Log:
Improve RegExp about jar name file to include Saxon-HE-x.x.x-y.jar (on
download_jar task and Jar junit test)
Bugzilla Id: 63033
Modified:
jmeter/trunk/build.xml
jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java
Modified: jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1853311&r1=1853310&r2=1853311&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Feb 10 14:32:30 2019
@@ -3381,7 +3381,7 @@ run JMeter unless all the JMeter jars ar
<tokenfilter>
<filetokenizer/>
<!-- Replace version with a wildcard. e.g, foo-1.2.3.jar or
foo-1.2.3.RELEASE.jar to foo-*.jar -->
- <replaceregex pattern="-(\d+\.){2,}([A-Za-z]+\.)?(jar|zip)"
replace="-*\2"/>
+ <replaceregex pattern="-(\d+\.){2,}([A-Za-z]*)[-|\d]*?\.(jar|zip)"
replace="-*\2"/>
</tokenfilter>
</filterchain>
</loadresource>
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=1853311&r1=1853310&r2=1853311&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java Sun Feb 10
14:32:30 2019
@@ -146,7 +146,7 @@ public class JMeterVersionTest extends J
// <classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
// <classpathentry kind="lib" path="lib/activation-1.1.1.jar"/>
// <classpathentry kind="lib" path="lib/jtidy-r938.jar"/>
- final Pattern p = Pattern.compile("\\s+<classpathentry kind=\"lib\"
path=\"lib/(?:api/)?(.+?)-([^-]+(-b\\d+|-BETA\\d)?)\\.jar\"/>");
+ final Pattern p = Pattern.compile("\\s+<classpathentry kind=\"lib\"
path=\"lib/(?:api/)?(.+?)-([^-]+(-\\d*|-b\\d+|-BETA\\d)?)\\.jar\"/>");
final Pattern versionPat = Pattern.compile("\\$\\{(.+)\\.version\\}");
String line;
final ArrayList<String> toRemove = new ArrayList<>();
@@ -162,9 +162,6 @@ public class JMeterVersionTest extends J
} else if (jar.equals("spock-core-1.0-groovy")) { // special
handling
jar = "spock-core";
version = "1.0-groovy-2.4";
- } else if (jar.equals("Saxon-HE-9.9.1")) { // special handling
- jar = "Saxon-HE";
- version = "9.9.1-1";
}else {
String tmp = JAR_TO_BUILD_PROP.get(jar);
if (tmp != null) {
