servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ksobkow...@apache.org
Subject servicemix git commit: [SM-2976] stax-ex-1.7.6.jar is under CDDL+GPL license
Date Wed, 11 May 2016 20:50:56 GMT
Repository: servicemix
Updated Branches:
  refs/heads/servicemix-5.5.x 87d1ea8dd -> 93eeaa6eb


[SM-2976] stax-ex-1.7.6.jar is under CDDL+GPL license


Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/93eeaa6e
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/93eeaa6e
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/93eeaa6e

Branch: refs/heads/servicemix-5.5.x
Commit: 93eeaa6eb680b36e2f8c7dd912d9f19697f9c91a
Parents: 87d1ea8
Author: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Authored: Wed May 11 20:15:46 2016 +0200
Committer: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Committed: Wed May 11 22:50:40 2016 +0200

----------------------------------------------------------------------
 NOTICE                                               | 6 ++++++
 assembly/src/main/appended-resources/META-INF/NOTICE | 5 +++++
 2 files changed, 11 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/93eeaa6e/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 178e076..fdca95c 100644
--- a/NOTICE
+++ b/NOTICE
@@ -14,3 +14,9 @@
    or under the (unmodified) EPL 1.0 (Eclipse Public License).
    An original copy of the license agreement can be found at: http://www.h2database.com/html/license.html
 
+   This software contains unmodified binary redistributions for StAX-Ex library (https://stax-ex.java.net/),
+   which is dual licensed and available under the (unmodified) CDDL 1.1 (Common Development
and Distribution License)
+   or under the (unmodified) GPL v2 (GNU General Public License).
+   An original copy of the license agreement can be found at: http://glassfish.java.net/public/CDDL+GPL_1_1.html
+
+

http://git-wip-us.apache.org/repos/asf/servicemix/blob/93eeaa6e/assembly/src/main/appended-resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/assembly/src/main/appended-resources/META-INF/NOTICE b/assembly/src/main/appended-resources/META-INF/NOTICE
index 896541a..ac6fe6f 100644
--- a/assembly/src/main/appended-resources/META-INF/NOTICE
+++ b/assembly/src/main/appended-resources/META-INF/NOTICE
@@ -6,3 +6,8 @@ which is dual licensed and available under a modified version of the MPL 1.1
(Mo
 or under the (unmodified) EPL 1.0 (Eclipse Public License).
 An original copy of the license agreement can be found at: http://www.h2database.com/html/license.html
 
+
+This software contains unmodified binary redistributions for StAX-Ex library (https://stax-ex.java.net/),
+which is dual licensed and available under the (unmodified) CDDL 1.1 (Common Development
and Distribution License)
+or under the (unmodified) GPL v2 (GNU General Public License).
+An original copy of the license agreement can be found at: http://glassfish.java.net/public/CDDL+GPL_1_1.html
\ No newline at end of file


Mime
View raw message