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/10/30 21:13:58 UTC
svn commit: r1813831 - in /jmeter/trunk: LICENSE
test/src/org/apache/jmeter/JMeterVersionTest.java
Author: pmouawad
Date: Mon Oct 30 21:13:58 2017
New Revision: 1813831
URL: http://svn.apache.org/viewvc?rev=1813831&view=rev
Log:
Bug 61697 - Introduce Darcula Look And Feel to make JMeter UI more attractive
Fix tests
Bugzilla Id: 61697
Modified:
jmeter/trunk/LICENSE
jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java
Modified: jmeter/trunk/LICENSE
URL: http://svn.apache.org/viewvc/jmeter/trunk/LICENSE?rev=1813831&r1=1813830&r2=1813831&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Mon Oct 30 21:13:58 2017
@@ -247,7 +247,7 @@ The following software is provided under
* accessors-smart-1.2.jar
* caffeine-2.5.5.jar
-* darcular.jar
+* darcula.jar
* freemarker-2.3.23.jar (AL2.0, see licenses/bin for additional info)
* json-path-2.4.0.jar
* json-smart-2.3.jar
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=1813831&r1=1813830&r2=1813831&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java Mon Oct 30 21:13:58 2017
@@ -105,6 +105,12 @@ public class JMeterVersionTest extends J
propNames.remove("jdom");
propNames.remove("velocity");
propNames.remove("commons-lang"); // lang3 is bundled, lang2 is doc-only
+
+ // Darcula is not a maven artifact
+ propNames.remove("darcula"); // not needed in Maven
+ buildProp.remove("darcula.loc"); // not a Maven download
+ versions.remove("darcula");
+
// remove optional checkstyle name
propNames.remove("checkstyle-all"); // not needed in Maven
buildProp.remove("checkstyle-all.loc"); // not a Maven download
@@ -270,7 +276,7 @@ public class JMeterVersionTest extends J
if (m.matches()) {
final String name = m.group(1);
assertTrue("Duplicate jar in LICENSE file " + line, namesInLicenseFile.add(name));
- if (!binaryJarNames.contains(name)) {
+ if (!binaryJarNames.contains(name) && !(line.indexOf("darcula")>=0)) {
fail("Unexpected entry in LICENCE file: " + line);
}
final String comment = m.group(2);