You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2016/05/11 20:50:15 UTC
servicemix git commit: [SM-2976] stax-ex-1.7.6.jar is under CDDL+GPL
license
Repository: servicemix
Updated Branches:
refs/heads/servicemix-5.x 5476209c9 -> eeb150e27
[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/eeb150e2
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/eeb150e2
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/eeb150e2
Branch: refs/heads/servicemix-5.x
Commit: eeb150e27b607cb4355335d86efc273f9b068c3f
Parents: 5476209
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Wed May 11 20:15:46 2016 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Wed May 11 22:49:39 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/eeb150e2/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/eeb150e2/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