From 40b31db633ce2bb78336b87d1be4dca3c315639c Mon Sep 17 00:00:00 2001 From: antelder Date: Wed, 1 Jul 2009 15:11:42 +0000 Subject: Merge LICENSE fixes in r790200 from trunk to m3 branch git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@790211 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca-java-2.0-M3/distribution/all/src/main/release/bin/LICENSE | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'branches') diff --git a/branches/sca-java-2.0-M3/distribution/all/src/main/release/bin/LICENSE b/branches/sca-java-2.0-M3/distribution/all/src/main/release/bin/LICENSE index 3ee6b2d3be..45ac77dc50 100644 --- a/branches/sca-java-2.0-M3/distribution/all/src/main/release/bin/LICENSE +++ b/branches/sca-java-2.0-M3/distribution/all/src/main/release/bin/LICENSE @@ -213,10 +213,6 @@ conditions of the following licenses. =============================================================================== -The following components come under Apache Software License 1.1 - - commons-discovery-0.4.jar - The following components come under Apache Software License 2.0 activeio-2.0-r118.jar @@ -226,7 +222,6 @@ The following components come under Apache Software License 2.0 axiom-api-1.2.7.jar axiom-dom-1.2.7.jar axiom-impl-1.2.7.jar - axis2-adb-1.4.1.jar axis2-codegen-1.4.1.jar axis2-kernel-1.4.1.jar axis2-java2wsdl-1.4.1.jar @@ -729,6 +724,7 @@ jaxb-impl-2.1.11.jar, jaxws-api-2.1.jar, jsr181-api-1.0-MR1.jar, jsr250-api-1.0.jar, +jstl-1.1.2.jar, mail-1.4.jar, servlet-api-2.5.jar, -- cgit v1.2.3