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:49:09 UTC
[1/2] servicemix git commit: [SM-2976] stax-ex-1.7.6.jar is under
CDDL+GPL license
Repository: servicemix
Updated Branches:
refs/heads/servicemix-6.0.x 38f9ecbf0 -> 44376da76
[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/8a9b2cf6
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/8a9b2cf6
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/8a9b2cf6
Branch: refs/heads/servicemix-6.0.x
Commit: 8a9b2cf670fa56edffccd3494314551515d9438b
Parents: 38f9ecb
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:46:53 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/8a9b2cf6/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/8a9b2cf6/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
[2/2] servicemix git commit: [SM-2984] Correct the shutdown command
in branding.properties
Posted by ks...@apache.org.
[SM-2984] Correct the shutdown command in branding.properties
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/44376da7
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/44376da7
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/44376da7
Branch: refs/heads/servicemix-6.0.x
Commit: 44376da761f7556035b3a1f0213d7fbcd20800b0
Parents: 8a9b2cf
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Wed May 11 22:28:51 2016 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Wed May 11 22:48:34 2016 +0200
----------------------------------------------------------------------
.../main/resources/org/apache/karaf/branding/branding.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/44376da7/branding/src/main/resources/org/apache/karaf/branding/branding.properties
----------------------------------------------------------------------
diff --git a/branding/src/main/resources/org/apache/karaf/branding/branding.properties b/branding/src/main/resources/org/apache/karaf/branding/branding.properties
index 15aefec..b830210 100644
--- a/branding/src/main/resources/org/apache/karaf/branding/branding.properties
+++ b/branding/src/main/resources/org/apache/karaf/branding/branding.properties
@@ -28,7 +28,7 @@ welcome = \
\n\
Hit '\u001B[1m<tab>\u001B[0m' for a list of available commands\n\
and '\u001B[1m[cmd] --help\u001B[0m' for help on a specific command.\n\
-Hit '<ctrl-d>' or 'osgi:shutdown' to shutdown ServiceMix.\n
+Hit '<ctrl-d>' or 'system:shutdown' to shutdown ServiceMix.\n
prompt = \u001B[1m${USER}@${APPLICATION}\u001B[0m>