summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/distribution
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2012-06-07 13:10:54 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2012-06-07 13:10:54 +0000
commit149a3e8a9d795cc1daafa7ea5145ae4ad48eefd1 (patch)
tree2b722d40621ec710929d8b340a6444210e85057d /sca-java-2.x/trunk/distribution
parent14d9a2eb7ec305e704a8ce4c3dc9f89778847426 (diff)
TUSCANY-4058: Apply update from Andrew Potter to support IBM JDK
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1347597 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/distribution')
-rw-r--r--sca-java-2.x/trunk/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java13
1 files changed, 8 insertions, 5 deletions
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java b/sca-java-2.x/trunk/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
index 04e6a0bc5c..2f248ee3d0 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
@@ -101,11 +101,14 @@ public class JarsInLICENSETestCase {
String licenseText = readLICENSE(licenseFile);
for (String jar : jars) {
if (!licenseText.contains(jar)) {
- if (jar.startsWith("tuscany-")) {
- // ignore tuscany jars as they're not mentioned in the LICENSE file
- } else {
- badJars.add(jar);
- }
+ if (jar.startsWith("tuscany-")) {
+ // 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("jaka rta-regexp-1.4.jar") || jar.equals("xalan-2.7.0.jar") || jar.equals("xml-apis-1.0.b2.jar"))) {
+ // ignore IBM JDK specific jars.
+ } else {
+ badJars.add(jar);
+ }
}
}
return badJars;