You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2012/03/26 17:01:27 UTC
svn commit: r1305382 - in /incubator/lcf/trunk: CHANGES.txt LICENSE.txt
Author: kwright
Date: Mon Mar 26 15:01:26 2012
New Revision: 1305382
URL: http://svn.apache.org/viewvc?rev=1305382&view=rev
Log:
Fix for CONNECTORS-434.
Modified:
incubator/lcf/trunk/CHANGES.txt
incubator/lcf/trunk/LICENSE.txt
Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1305382&r1=1305381&r2=1305382&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Mon Mar 26 15:01:26 2012
@@ -12,6 +12,10 @@ CONNECTORS-431: Update pom.xml versions.
======================= Release 0.5 =========================
+CONNECTORS-434: Describe which licenses we select for our dual-licensed
+jars.
+(Karl Wright)
+
CONNECTORS-433: Update copyright date.
(Karl Wright)
Modified: incubator/lcf/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/LICENSE.txt?rev=1305382&r1=1305381&r2=1305382&view=diff
==============================================================================
--- incubator/lcf/trunk/LICENSE.txt (original)
+++ incubator/lcf/trunk/LICENSE.txt Mon Mar 26 15:01:26 2012
@@ -230,15 +230,19 @@ License: Apache 2 (http://www.apache.or
This product includes a jaxb-impl.jar.
License: Dual license consisting of the CDDL v1.0 and GPL v2 (https://glassfish.dev.java.net/public/CDDL+GPL.html)
+Jar included under terms of CDDL v1.0 license.
This product includes a saaj-impl.jar.
License: Dual license consisting of the CDDL v1.0 and GPL v2 (https://glassfish.dev.java.net/public/CDDL+GPL.html)
+Jar included under terms of CDDL v1.0 license.
This product includes a streambuffer.jar.
License: Dual license consisting of the CDDL v1.0 and GPL v2 (https://glassfish.dev.java.net/public/CDDL+GPL.html)
+Jar included under terms of CDDL v1.0 license.
This product includes a jaxws-rt.jar.
License: Dual license consisting of the CDDL v1.0 and GPL v2 (https://glassfish.dev.java.net/public/CDDL+GPL.html)
+Jar included under terms of CDDL v1.0 license.
This product includes an activation.jar.
License: Common Development And Distribution License (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html)
@@ -248,15 +252,18 @@ License: Common Development And Distribu
This product includes a jsr181-api.jar.
License: Dual license consisting of the CDDL v1.0 and GPL v2 (https://glassfish.dev.java.net/public/CDDL+GPL.html)
+Jar included under terms of CDDL v1.0 license.
This product includes a jaxb-api.jar.
License: Common Development And Distribution License (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html)
This product includes a saaj-api.jar.
License: Dual license consisting of the CDDL v1.0 and GPL v2 (https://glassfish.dev.java.net/public/CDDL+GPL.html)
+Jar included under terms of CDDL v1.0 license.
This product includes a jaxws-api.jar.
License: Dual license consisting of the CDDL v1.0 and GPL v2 (https://glassfish.dev.java.net/public/CDDL+GPL.html)
+Jar included under terms of CDDL v1.0 license.
This product includes a mimepull.jar.
License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.opensource.org/licenses/cddl1.php) License: GPLv2 with classpath exception (http://www.gnu.org/software/classpath/license.html)
@@ -275,6 +282,7 @@ License: Apache 2 (http://www.apache.or
This product includes a h2-1.3.158.jar.
License: Dual; MPL 1.1 (http://www.mozilla.org/MPL/), and Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+Jar included under terms of EPL 1.0.
This product includes a xmlsec-1.4.1.jar.
License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)