summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2012-06-07 13:13:31 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2012-06-07 13:13:31 +0000
commita6ec88e1df13212f7e3bf0b6f3c2463429264187 (patch)
tree35119708370ce6a84b794f3a6a34613e0cd1936b
parent149a3e8a9d795cc1daafa7ea5145ae4ad48eefd1 (diff)
TUSCANY-4058: Apply update from Andrew Potter to support IBM JDK
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1347599 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-2.x/trunk/testing/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/sca-java-2.x/trunk/testing/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java b/sca-java-2.x/trunk/testing/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
index 865eec3636..49d6486aa2 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
+++ b/sca-java-2.x/trunk/testing/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
@@ -103,6 +103,8 @@ public class JarsInLICENSETestCase {
if (!licenseText.contains(jar)) {
if (jar.startsWith("tuscany-") || jar.startsWith("sample-") || jar.startsWith("test-") || jar.startsWith("itest-")) {
// ignore tuscany jars as they're not mentioned in the LICENSE file
+ } else if (System.getProperty("java.vendor").equals("IBM Corporation") && (jar.equals("bcel-5.2.jar") || jar.equals("jakarta-regexp-1.4.jar"))) {
+ // ignore IBM JDK specific jars.
} else {
badJars.add(jar);
}